summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-02-12 12:58:48 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-03-12 08:59:43 +0100
commit4850f7aac30aebf4ef64b1d3f1d324333b5978c2 (patch)
tree6756c2c0edff1adc447215bc1a7983848bfc3fc6
parentb502d204d7c9ad5ff6f6e2beb5d3e2e1546c295a (diff)
downloadptxdist-4850f7aac30aebf4ef64b1d3f1d324333b5978c2.tar.gz
ptxdist-4850f7aac30aebf4ef64b1d3f1d324333b5978c2.tar.xz
update all spdx license identifier to the new version
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/acl.make2
-rw-r--r--rules/alfred.make2
-rw-r--r--rules/alsa-lib.make2
-rw-r--r--rules/alsa-utils.make2
-rw-r--r--rules/archivemount.make2
-rw-r--r--rules/arm-memspeed.make2
-rw-r--r--rules/atk.make2
-rw-r--r--rules/atop.make2
-rw-r--r--rules/attr.make2
-rw-r--r--rules/audiofile.make2
-rw-r--r--rules/aumix.make2
-rw-r--r--rules/avahi.make2
-rw-r--r--rules/barebox.make2
-rw-r--r--rules/barebox_mlo.make2
-rw-r--r--rules/bash.make2
-rw-r--r--rules/batctl.make2
-rw-r--r--rules/beep.make2
-rw-r--r--rules/bluez.make2
-rw-r--r--rules/boa.make2
-rw-r--r--rules/bonniexx.make2
-rw-r--r--rules/bootchart.make2
-rw-r--r--rules/bridge-utils.make2
-rw-r--r--rules/bustle.make2
-rw-r--r--rules/busybox.make2
-rw-r--r--rules/cairo.make2
-rw-r--r--rules/canutils.make2
-rw-r--r--rules/cbenchsuite.make2
-rw-r--r--rules/cmatrix.make2
-rw-r--r--rules/collectd.make2
-rw-r--r--rules/comgt.make2
-rw-r--r--rules/connman.make2
-rw-r--r--rules/coreutils.make2
-rw-r--r--rules/cryptsetup.make2
-rw-r--r--rules/cups-filters.make2
-rw-r--r--rules/cups.make2
-rw-r--r--rules/cxxtools.make2
-rw-r--r--rules/dbus-glib.make2
-rw-r--r--rules/dbus-python.make2
-rw-r--r--rules/dbus.make2
-rw-r--r--rules/dconf.make2
-rw-r--r--rules/dfu-util.make2
-rw-r--r--rules/dhcp-helper.make2
-rw-r--r--rules/dhex.make2
-rw-r--r--rules/dialog.make2
-rw-r--r--rules/dibbler.make2
-rw-r--r--rules/dosfstools.make2
-rw-r--r--rules/dropwatch.make2
-rw-r--r--rules/dt-utils.make2
-rw-r--r--rules/e2fsprogs.make2
-rw-r--r--rules/easy-rsa.make2
-rw-r--r--rules/ecryptfs-utils.make2
-rw-r--r--rules/ed.make2
-rw-r--r--rules/eggdbus.make2
-rw-r--r--rules/ethtool.make2
-rw-r--r--rules/evtest.make2
-rw-r--r--rules/f2fs-tools.make2
-rw-r--r--rules/fbset.make2
-rw-r--r--rules/fbterm.make2
-rw-r--r--rules/fbtest.make2
-rw-r--r--rules/fbutils.make2
-rw-r--r--rules/fbv.make2
-rw-r--r--rules/freetype.make2
-rw-r--r--rules/fuse.make2
-rw-r--r--rules/gdb.make2
-rw-r--r--rules/gdbserver.make2
-rw-r--r--rules/gdk-pixbuf.make2
-rw-r--r--rules/gettext.make2
-rw-r--r--rules/glib-networking.make2
-rw-r--r--rules/glib.make2
-rw-r--r--rules/glmark2.make2
-rw-r--r--rules/gnupg.make2
-rw-r--r--rules/gnutls.make2
-rw-r--r--rules/gobject-introspection.make2
-rw-r--r--rules/gpm.make2
-rw-r--r--rules/gst-plugins-bad1.make2
-rw-r--r--rules/gst-plugins-base.make2
-rw-r--r--rules/gst-plugins-base1.make2
-rw-r--r--rules/gst-plugins-good1.make2
-rw-r--r--rules/gst-plugins-ugly1.make2
-rw-r--r--rules/gst-python1.make2
-rw-r--r--rules/gst-rtsp-server1.make2
-rw-r--r--rules/gst-validate1.make2
-rw-r--r--rules/gstreamer-vaapi1.make2
-rw-r--r--rules/gstreamer.make2
-rw-r--r--rules/gstreamer1.make2
-rw-r--r--rules/gtk.make2
-rw-r--r--rules/gzip.make2
-rw-r--r--rules/haveged.make2
-rw-r--r--rules/hexedit.make2
-rw-r--r--rules/host-autotools-autoconf.make2
-rw-r--r--rules/host-autotools-automake.make2
-rw-r--r--rules/host-autotools-libtool.make2
-rw-r--r--rules/host-chrpath.make2
-rw-r--r--rules/host-elf-h-compat.make2
-rw-r--r--rules/host-fakeroot.make2
-rw-r--r--rules/host-genext2fs.make2
-rw-r--r--rules/host-genimage.make2
-rw-r--r--rules/host-gperf.make2
-rw-r--r--rules/host-gtk-doc.make2
-rw-r--r--rules/host-intltool.make2
-rw-r--r--rules/host-kernel-header.make2
-rw-r--r--rules/host-localedef.make2
-rw-r--r--rules/host-lzop.make2
-rw-r--r--rules/host-m4.make2
-rw-r--r--rules/host-mtools.make2
-rw-r--r--rules/host-opkg-utils.make2
-rw-r--r--rules/host-pkg-config.make2
-rw-r--r--rules/host-qooxdoo.make2
-rw-r--r--rules/hping.make2
-rw-r--r--rules/htop.make2
-rw-r--r--rules/hub-ctrl.make2
-rw-r--r--rules/i2c-tools.make2
-rw-r--r--rules/iftop.make2
-rw-r--r--rules/ima-evm-utils.make2
-rw-r--r--rules/iproute2.make2
-rw-r--r--rules/iptables.make2
-rw-r--r--rules/iputils.make2
-rw-r--r--rules/json-dbus-bridge.make2
-rw-r--r--rules/json-glib.make2
-rw-r--r--rules/kbd.make2
-rw-r--r--rules/kernel-header.make2
-rw-r--r--rules/kernel.make2
-rw-r--r--rules/keyutils.make2
-rw-r--r--rules/killproc.make2
-rw-r--r--rules/lame.make2
-rw-r--r--rules/latencytop.make2
-rw-r--r--rules/latrace.make2
-rw-r--r--rules/ldd.make2
-rw-r--r--rules/less.make2
-rw-r--r--rules/libaio.make2
-rw-r--r--rules/libao.make2
-rw-r--r--rules/libassuan.make2
-rw-r--r--rules/libcap-ng.make2
-rw-r--r--rules/libcap.make2
-rw-r--r--rules/libcgi.make2
-rw-r--r--rules/libcgroup.make2
-rw-r--r--rules/libcoap.make2
-rw-r--r--rules/libconfig.make2
-rw-r--r--rules/libdaemon.make2
-rw-r--r--rules/libelf.make2
-rw-r--r--rules/libestr.make2
-rw-r--r--rules/libexif.make2
-rw-r--r--rules/libfaketime.make2
-rw-r--r--rules/libftdi.make2
-rw-r--r--rules/libftdi1.make2
-rw-r--r--rules/libgcrypt.make2
-rw-r--r--rules/libgee.make2
-rw-r--r--rules/libgmp.make2
-rw-r--r--rules/libgpg-error.make2
-rw-r--r--rules/libgpiod.make2
-rw-r--r--rules/libgudev.make2
-rw-r--r--rules/libiodbc.make2
-rw-r--r--rules/libkmod.make2
-rw-r--r--rules/libksba.make2
-rw-r--r--rules/liblockfile.make2
-rw-r--r--rules/libltdl.make2
-rw-r--r--rules/liblzo.make2
-rw-r--r--rules/libmad.make2
-rw-r--r--rules/libmbim.make2
-rw-r--r--rules/libmicrohttpd.make2
-rw-r--r--rules/libmikmod.make2
-rw-r--r--rules/libmms.make2
-rw-r--r--rules/libmnl.make2
-rw-r--r--rules/libmodbus.make2
-rw-r--r--rules/libmodbus3.make2
-rw-r--r--rules/libmpeg2.make2
-rw-r--r--rules/libmxml.make2
-rw-r--r--rules/libndp.make2
-rw-r--r--rules/libnetfilter_conntrack.make2
-rw-r--r--rules/libnetfilter_queue.make2
-rw-r--r--rules/libnewt.make2
-rw-r--r--rules/libnftnl.make2
-rw-r--r--rules/libnih.make2
-rw-r--r--rules/libnl.make2
-rw-r--r--rules/libnl3.make2
-rw-r--r--rules/liboping.make2
-rw-r--r--rules/libpaper.make2
-rw-r--r--rules/libpipeline.make2
-rw-r--r--rules/libqmi.make2
-rw-r--r--rules/libqxt.make2
-rw-r--r--rules/libseccomp.make2
-rw-r--r--rules/libsemanage.make2
-rw-r--r--rules/libsepol.make2
-rw-r--r--rules/libshout.make2
-rw-r--r--rules/libsndfile.make2
-rw-r--r--rules/libsocketcan.make2
-rw-r--r--rules/libsoup.make2
-rw-r--r--rules/libsysfs.make2
-rw-r--r--rules/libtasn1.make2
-rw-r--r--rules/liburcu.make2
-rw-r--r--rules/libusb-compat.make2
-rw-r--r--rules/libusb.make2
-rw-r--r--rules/libzmq.make2
-rw-r--r--rules/linuxptp.make2
-rw-r--r--rules/lm_sensors.make2
-rw-r--r--rules/lmbench.make2
-rw-r--r--rules/logrotate.make2
-rw-r--r--rules/lpc21isp.make2
-rw-r--r--rules/lshw.make2
-rw-r--r--rules/lvm2.make2
-rw-r--r--rules/lz4.make2
-rw-r--r--rules/mariadb.make2
-rw-r--r--rules/mc.make2
-rw-r--r--rules/memedit.make2
-rw-r--r--rules/memtest.make2
-rw-r--r--rules/memtester.make2
-rw-r--r--rules/memtool.make2
-rw-r--r--rules/microcom.make2
-rw-r--r--rules/minicom.make2
-rw-r--r--rules/mmc-utils.make2
-rw-r--r--rules/modemmanager.make2
-rw-r--r--rules/module-init-tools.make2
-rw-r--r--rules/monit.make2
-rw-r--r--rules/mosh.make2
-rw-r--r--rules/mpg123.make2
-rw-r--r--rules/msmtp.make2
-rw-r--r--rules/mtd-utils.make2
-rw-r--r--rules/mtr.make2
-rw-r--r--rules/munin.make2
-rw-r--r--rules/mysql.make2
-rw-r--r--rules/nano.make2
-rw-r--r--rules/nbd.make2
-rw-r--r--rules/nettle.make2
-rw-r--r--rules/networkmanager.make2
-rw-r--r--rules/nfsutils.make2
-rw-r--r--rules/nftables.make2
-rw-r--r--rules/npth.make2
-rw-r--r--rules/nss-mdns.make2
-rw-r--r--rules/ntpclient.make2
-rw-r--r--rules/openocd.make2
-rw-r--r--rules/opensc.make2
-rw-r--r--rules/opkg.make2
-rw-r--r--rules/owfs.make2
-rw-r--r--rules/pango.make2
-rw-r--r--rules/parted.make2
-rw-r--r--rules/pciutils.make2
-rw-r--r--rules/pcsc-lite.make2
-rw-r--r--rules/perl.make2
-rw-r--r--rules/picocom.make2
-rw-r--r--rules/policycoreutils.make2
-rw-r--r--rules/poppler-data.make2
-rw-r--r--rules/poppler.make2
-rw-r--r--rules/powertop.make2
-rw-r--r--rules/ppp.make2
-rw-r--r--rules/prelink.make2
-rw-r--r--rules/procps.make2
-rw-r--r--rules/ps3-utils.make2
-rw-r--r--rules/pslib.make2
-rw-r--r--rules/ptrtd.make2
-rw-r--r--rules/pulseaudio.make2
-rw-r--r--rules/pygobject.make2
-rw-r--r--rules/python3-chardet.make2
-rw-r--r--rules/python3-gi.make2
-rw-r--r--rules/python3-pyside.make2
-rw-r--r--rules/python3-shiboken.make2
-rw-r--r--rules/python3-systemd.make2
-rw-r--r--rules/qrencode.make2
-rw-r--r--rules/qt4.make2
-rw-r--r--rules/qt5.make2
-rw-r--r--rules/quagga.make2
-rw-r--r--rules/quota-tools.make2
-rw-r--r--rules/qwt5.make2
-rw-r--r--rules/rauc.make2
-rw-r--r--rules/readline.make2
-rw-r--r--rules/rng-tools.make2
-rw-r--r--rules/rrdtool.make2
-rw-r--r--rules/rsync3.make2
-rw-r--r--rules/rsyslog.make2
-rw-r--r--rules/rt-tests.make2
-rw-r--r--rules/rtmpdump.make2
-rw-r--r--rules/rtps.make2
-rw-r--r--rules/rxtx.make2
-rw-r--r--rules/samba.make2
-rw-r--r--rules/sched_switch.make2
-rw-r--r--rules/schedtool.make2
-rw-r--r--rules/screen.make2
-rw-r--r--rules/sdl.make2
-rw-r--r--rules/sdl_image.make2
-rw-r--r--rules/sdl_mixer.make2
-rw-r--r--rules/sed.make2
-rw-r--r--rules/sepolgen.make2
-rw-r--r--rules/smartmontools.make2
-rw-r--r--rules/socat.make2
-rw-r--r--rules/squashfs-tools.make2
-rw-r--r--rules/ssmtp.make2
-rw-r--r--rules/stress-ng.make2
-rw-r--r--rules/stress.make2
-rw-r--r--rules/syslogng.make2
-rw-r--r--rules/sysstat.make2
-rw-r--r--rules/systemd-bootchart.make2
-rw-r--r--rules/systemd.make2
-rw-r--r--rules/termcap.make2
-rw-r--r--rules/tntnet.make2
-rw-r--r--rules/trace-cmd.make2
-rw-r--r--rules/u-boot-tools.make2
-rw-r--r--rules/udev.make2
-rw-r--r--rules/unstrung.make2
-rw-r--r--rules/upower.make2
-rw-r--r--rules/usb-modeswitch-data.make2
-rw-r--r--rules/usb-modeswitch.make2
-rw-r--r--rules/usbutils.make2
-rw-r--r--rules/ustr.make2
-rw-r--r--rules/util-linux-ng.make2
-rw-r--r--rules/v4l-utils.make2
-rw-r--r--rules/valgrind.make2
-rw-r--r--rules/vorbis-tools.make2
-rw-r--r--rules/watchdog.make2
-rw-r--r--rules/which.make2
-rw-r--r--rules/wireless.make2
-rw-r--r--rules/wpa_supplicant.make2
-rw-r--r--rules/xfsprogs.make2
-rw-r--r--rules/xz.make2
312 files changed, 312 insertions, 312 deletions
diff --git a/rules/acl.make b/rules/acl.make
index d30fe7f86..b950b0401 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 AND LGPL-2.1
+ACL_LICENSE := GPL-2.0-only AND LGPL-2.1-only
ACL_LICENSE_FILES := \
file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764
diff --git a/rules/alfred.make b/rules/alfred.make
index cfb60bdf4..fcb031d8e 100644
--- a/rules/alfred.make
+++ b/rules/alfred.make
@@ -23,7 +23,7 @@ ALFRED_SUFFIX := tar.gz
ALFRED_URL := http://downloads.open-mesh.org/batman/stable/sources/alfred/$(ALFRED).$(ALFRED_SUFFIX)
ALFRED_SOURCE := $(SRCDIR)/$(ALFRED).$(ALFRED_SUFFIX)
ALFRED_DIR := $(BUILDDIR)/$(ALFRED)
-ALFRED_LICENSE := GPL-2.0
+ALFRED_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 8f33ced34..4e150d42a 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -37,7 +37,7 @@ endif
ALSA_LIB_SOURCE := $(SRCDIR)/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
ALSA_LIB_DIR := $(BUILDDIR)/$(ALSA_LIB)
-ALSA_LIB_LICENSE := LGPL-2.1+
+ALSA_LIB_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 8feed9535..60e417db8 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -26,7 +26,7 @@ ALSA_UTILS_URL := \
ftp://ftp.alsa-project.org/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX)
ALSA_UTILS_SOURCE := $(SRCDIR)/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX)
ALSA_UTILS_DIR := $(BUILDDIR)/$(ALSA_UTILS)
-ALSA_UTILS_LICENSE := GPL-2.0+
+ALSA_UTILS_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/archivemount.make b/rules/archivemount.make
index 775c317f8..cc66f85f6 100644
--- a/rules/archivemount.make
+++ b/rules/archivemount.make
@@ -17,7 +17,7 @@ ARCHIVEMOUNT_SUFFIX := tar.gz
ARCHIVEMOUNT_URL := http://www.cybernoia.de/software/archivemount/$(ARCHIVEMOUNT).$(ARCHIVEMOUNT_SUFFIX)
ARCHIVEMOUNT_SOURCE := $(SRCDIR)/$(ARCHIVEMOUNT).$(ARCHIVEMOUNT_SUFFIX)
ARCHIVEMOUNT_DIR := $(BUILDDIR)/$(ARCHIVEMOUNT)
-ARCHIVEMOUNT_LICENSE := LGPL-2.0
+ARCHIVEMOUNT_LICENSE := LGPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/arm-memspeed.make b/rules/arm-memspeed.make
index 1c1abf4e4..62b2c9064 100644
--- a/rules/arm-memspeed.make
+++ b/rules/arm-memspeed.make
@@ -23,7 +23,7 @@ ARM_MEMSPEED_SUFFIX := tar.bz2
ARM_MEMSPEED_URL := http://www.kreuzholzen.de/src/arm-memspeed/$(ARM_MEMSPEED).$(ARM_MEMSPEED_SUFFIX)
ARM_MEMSPEED_SOURCE := $(SRCDIR)/$(ARM_MEMSPEED).$(ARM_MEMSPEED_SUFFIX)
ARM_MEMSPEED_DIR := $(BUILDDIR)/$(ARM_MEMSPEED)
-ARM_MEMSPEED_LICENSE := GPL-2.0
+ARM_MEMSPEED_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/atk.make b/rules/atk.make
index 74dbcd9e4..9efab961e 100644
--- a/rules/atk.make
+++ b/rules/atk.make
@@ -25,7 +25,7 @@ ATK_SUFFIX := tar.bz2
ATK_URL := http://ftp.gnome.org/pub/gnome/sources/atk/2.2/$(ATK).$(ATK_SUFFIX)
ATK_SOURCE := $(SRCDIR)/$(ATK).$(ATK_SUFFIX)
ATK_DIR := $(BUILDDIR)/$(ATK)
-ATK_LICENSE := LGPL-2.0
+ATK_LICENSE := LGPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/atop.make b/rules/atop.make
index 84f049180..477103f45 100644
--- a/rules/atop.make
+++ b/rules/atop.make
@@ -23,7 +23,7 @@ ATOP := atop-$(ATOP_VERSION)
ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz
ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz
ATOP_DIR := $(BUILDDIR)/$(ATOP)
-ATOP_LICENSE := GPL-2.0+
+ATOP_LICENSE := GPL-2.0-or-later
ATOP_LICENSE_FILES := file://COPYING;md5=393a5ca445f6965873eca0259a17f833
# ----------------------------------------------------------------------------
diff --git a/rules/attr.make b/rules/attr.make
index 8eeea393c..4898ae845 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 AND LGPL-2.0
+ATTR_LICENSE := GPL-2.0-only AND LGPL-2.0-only
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 d7953b9c8..b713e020b 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 AND LGPL-2.0
+AUDIOFILE_LICENSE := GPL-2.0-only AND LGPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/aumix.make b/rules/aumix.make
index af6a6a26c..adf221bf5 100644
--- a/rules/aumix.make
+++ b/rules/aumix.make
@@ -23,7 +23,7 @@ AUMIX_SUFFIX := tar.bz2
AUMIX_URL := $(call ptx/mirror, SF, aumix/$(AUMIX).$(AUMIX_SUFFIX))
AUMIX_SOURCE := $(SRCDIR)/$(AUMIX).$(AUMIX_SUFFIX)
AUMIX_DIR := $(BUILDDIR)/$(AUMIX)
-AUMIX_LICENSE := GPL-2.0
+AUMIX_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/avahi.make b/rules/avahi.make
index 8621bf89f..8f58ac61e 100644
--- a/rules/avahi.make
+++ b/rules/avahi.make
@@ -23,7 +23,7 @@ AVAHI_SUFFIX := tar.gz
AVAHI_URL := http://avahi.org/download/$(AVAHI).$(AVAHI_SUFFIX)
AVAHI_SOURCE := $(SRCDIR)/$(AVAHI).$(AVAHI_SUFFIX)
AVAHI_DIR := $(BUILDDIR)/$(AVAHI)
-AVAHI_LICENSE := LGPL-2.1+
+AVAHI_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/barebox.make b/rules/barebox.make
index a1133c485..7c389e770 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -24,7 +24,7 @@ BAREBOX_SUFFIX := tar.bz2
BAREBOX_URL := $(call barebox-url, BAREBOX)
BAREBOX_SOURCE := $(SRCDIR)/$(BAREBOX).$(BAREBOX_SUFFIX)
BAREBOX_DIR := $(BUILDDIR)/$(BAREBOX)
-BAREBOX_LICENSE := GPL-2.0
+BAREBOX_LICENSE := GPL-2.0-only
BAREBOX_DEVPKG := NO
BAREBOX_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_CONFIG))
diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make
index d22a289cc..e8d1743c1 100644
--- a/rules/barebox_mlo.make
+++ b/rules/barebox_mlo.make
@@ -22,7 +22,7 @@ BAREBOX_MLO := barebox-$(BAREBOX_MLO_VERSION)
BAREBOX_MLO_URL = http://www.barebox.org/download/$(BAREBOX_MLO).$(BAREBOX_SUFFIX)
BAREBOX_MLO_DIR := $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION)
BAREBOX_MLO_SOURCE = $(SRCDIR)/$(BAREBOX_MLO).$(BAREBOX_SUFFIX)
-BAREBOX_MLO_LICENSE := GPL-2.0
+BAREBOX_MLO_LICENSE := GPL-2.0-only
BAREBOX_MLO_CONFIG := $(call remove_quotes, \
$(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG))
diff --git a/rules/bash.make b/rules/bash.make
index 7d12030b1..2a862be13 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -23,7 +23,7 @@ BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX))
BASH_SOURCE := $(SRCDIR)/$(BASH).$(BASH_SUFFIX)
BASH_DIR := $(BUILDDIR)/$(BASH)
BASH_MAKE_PAR := NO
-BASH_LICENSE := GPL-3.0
+BASH_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/batctl.make b/rules/batctl.make
index 294b237bf..7b2ae5b1d 100644
--- a/rules/batctl.make
+++ b/rules/batctl.make
@@ -23,7 +23,7 @@ BATCTL_SUFFIX := tar.gz
BATCTL_URL := http://downloads.open-mesh.org/batman/stable/sources/batctl/$(BATCTL).$(BATCTL_SUFFIX)
BATCTL_SOURCE := $(SRCDIR)/$(BATCTL).$(BATCTL_SUFFIX)
BATCTL_DIR := $(BUILDDIR)/$(BATCTL)
-BATCTL_LICENSE := GPL-2.0
+BATCTL_LICENSE := GPL-2.0-only
BATCTL_CONF_TOOL := NO
BATCTL_MAKE_ENV := $(CROSS_ENV)
diff --git a/rules/beep.make b/rules/beep.make
index af39ffae5..b007a2cc0 100644
--- a/rules/beep.make
+++ b/rules/beep.make
@@ -23,7 +23,7 @@ BEEP_SUFFIX := tar.gz
BEEP_URL := http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX)
BEEP_SOURCE := $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX)
BEEP_DIR := $(BUILDDIR)/$(BEEP)
-BEEP_LICENSE := GPL-2.0
+BEEP_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/bluez.make b/rules/bluez.make
index 8285412e7..de6a1e5ec 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -23,7 +23,7 @@ BLUEZ_SUFFIX := tar.gz
BLUEZ_URL := $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX))
BLUEZ_SOURCE := $(SRCDIR)/$(BLUEZ).$(BLUEZ_SUFFIX)
BLUEZ_DIR := $(BUILDDIR)/$(BLUEZ)
-BLUEZ_LICENSE := GPL-2.0+ LGPL-2.1+
+BLUEZ_LICENSE := GPL-2.0-or-later LGPL-2.1-or-later
ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
BLUEZ_DEVPKG := NO
endif
diff --git a/rules/boa.make b/rules/boa.make
index 94ac61d43..bd6c45795 100644
--- a/rules/boa.make
+++ b/rules/boa.make
@@ -24,7 +24,7 @@ BOA_TARBALL := boa_$(BOA_VERSION).orig.$(BOA_SUFFIX)
BOA_URL := $(call ptx/mirror, DEB, pool/main/b/boa/$(BOA_TARBALL))
BOA_SOURCE := $(SRCDIR)/$(BOA_TARBALL)
BOA_DIR := $(BUILDDIR)/$(BOA)
-BOA_LICENSE := GPL-2.0
+BOA_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/bonniexx.make b/rules/bonniexx.make
index 1bddddf4f..533f21c28 100644
--- a/rules/bonniexx.make
+++ b/rules/bonniexx.make
@@ -24,7 +24,7 @@ BONNIEXX_SUFFIX := tgz
BONNIEXX_URL := http://www.coker.com.au/bonnie++/experimental/$(BONNIEXX).$(BONNIEXX_SUFFIX)
BONNIEXX_SOURCE := $(SRCDIR)/$(BONNIEXX).$(BONNIEXX_SUFFIX)
BONNIEXX_DIR := $(BUILDDIR)/$(BONNIEXX)
-BONNIEXX_LICENSE := GPL-2.0
+BONNIEXX_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/bootchart.make b/rules/bootchart.make
index 6f9daa068..cc4f0417c 100644
--- a/rules/bootchart.make
+++ b/rules/bootchart.make
@@ -24,7 +24,7 @@ BOOTCHART_TARBALL := bootchart_$(BOOTCHART_VERSION)-3.$(BOOTCHART_SUFFIX)
BOOTCHART_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(BOOTCHART_TARBALL)
BOOTCHART_SOURCE := $(SRCDIR)/$(BOOTCHART_TARBALL)
BOOTCHART_DIR := $(BUILDDIR)/$(BOOTCHART)
-BOOTCHART_LICENSE := GPL-3.0
+BOOTCHART_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make
index 39db4871e..f83f0a3ac 100644
--- a/rules/bridge-utils.make
+++ b/rules/bridge-utils.make
@@ -24,7 +24,7 @@ BRIDGE_UTILS_SUFFIX := tar.gz
BRIDGE_UTILS_URL := $(call ptx/mirror, SF, bridge/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX))
BRIDGE_UTILS_SOURCE := $(SRCDIR)/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
BRIDGE_UTILS_DIR := $(BUILDDIR)/$(BRIDGE_UTILS)
-BRIDGE_UTILS_LICENSE := GPL-2.0+
+BRIDGE_UTILS_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
diff --git a/rules/bustle.make b/rules/bustle.make
index 843c69045..b820ab144 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+ AND LGPL-2.1+
+BUSTLE_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/busybox.make b/rules/busybox.make
index e28e5c31f..f70326d50 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -24,7 +24,7 @@ BUSYBOX_URL := https://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX)
BUSYBOX_SOURCE := $(SRCDIR)/$(BUSYBOX).$(BUSYBOX_SUFFIX)
BUSYBOX_DIR := $(BUILDDIR)/$(BUSYBOX)
BUSYBOX_KCONFIG := $(BUSYBOX_DIR)/Config.in
-BUSYBOX_LICENSE := GPL-2.0
+BUSYBOX_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/cairo.make b/rules/cairo.make
index 7503247a4..95375eed8 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 AND MPL-1.1
+CAIRO_LICENSE := LGPL-2.1-only AND MPL-1.1
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/canutils.make b/rules/canutils.make
index 86c0a4841..2dc5fb8f4 100644
--- a/rules/canutils.make
+++ b/rules/canutils.make
@@ -24,7 +24,7 @@ CANUTILS_SUFFIX := tar.bz2
CANUTILS_URL := http://www.pengutronix.de/software/socket-can/download/canutils/v4.0/$(CANUTILS).$(CANUTILS_SUFFIX)
CANUTILS_SOURCE := $(SRCDIR)/$(CANUTILS).$(CANUTILS_SUFFIX)
CANUTILS_DIR := $(BUILDDIR)/$(CANUTILS)
-CANUTILS_LICENSE := GPL-2.0
+CANUTILS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/cbenchsuite.make b/rules/cbenchsuite.make
index 1ceb52073..cbe8c71dd 100644
--- a/rules/cbenchsuite.make
+++ b/rules/cbenchsuite.make
@@ -23,7 +23,7 @@ CBENCHSUITE_SUFFIX := tar.gz
CBENCHSUITE_URL := https://github.com/scosu/cbenchsuite/archive/v$(CBENCHSUITE_VERSION).$(CBENCHSUITE_SUFFIX)
CBENCHSUITE_SOURCE := $(SRCDIR)/$(CBENCHSUITE).$(CBENCHSUITE_SUFFIX)
CBENCHSUITE_DIR := $(BUILDDIR)/$(CBENCHSUITE)
-CBENCHSUITE_LICENSE := GPL-2.0+
+CBENCHSUITE_LICENSE := GPL-2.0-or-later
#
# autoconf
diff --git a/rules/cmatrix.make b/rules/cmatrix.make
index 4fe973766..e01070281 100644
--- a/rules/cmatrix.make
+++ b/rules/cmatrix.make
@@ -23,7 +23,7 @@ CMATRIX_SUFFIX := tar.gz
CMATRIX_URL := http://www.asty.org/cmatrix/dist/$(CMATRIX).$(CMATRIX_SUFFIX)
CMATRIX_SOURCE := $(SRCDIR)/$(CMATRIX).$(CMATRIX_SUFFIX)
CMATRIX_DIR := $(BUILDDIR)/$(CMATRIX)
-CMATRIX_LICENSE := GPL-2.0
+CMATRIX_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/collectd.make b/rules/collectd.make
index f97d03230..8ca4bbf15 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 AND GPL-2.0
+COLLECTD_LICENSE := MIT AND GPL-2.0-only
COLLECTD_LICENSE_FILES := file://COPYING;md5=1bd21f19f7f0c61a7be8ecacb0e28854
# ----------------------------------------------------------------------------
diff --git a/rules/comgt.make b/rules/comgt.make
index e8039c964..f2faca536 100644
--- a/rules/comgt.make
+++ b/rules/comgt.make
@@ -23,7 +23,7 @@ COMGT_SUFFIX := tgz
COMGT_URL := $(call ptx/mirror, SF, comgt/$(COMGT).$(COMGT_SUFFIX))
COMGT_SOURCE := $(SRCDIR)/$(COMGT).$(COMGT_SUFFIX)
COMGT_DIR := $(BUILDDIR)/$(COMGT)
-COMGT_LICENSE := GPL-2.0
+COMGT_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/connman.make b/rules/connman.make
index 7e1cf64d9..cc995a83b 100644
--- a/rules/connman.make
+++ b/rules/connman.make
@@ -23,7 +23,7 @@ CONNMAN_SUFFIX := tar.gz
CONNMAN_URL := $(call ptx/mirror, KERNEL, network/connman/$(CONNMAN).$(CONNMAN_SUFFIX))
CONNMAN_SOURCE := $(SRCDIR)/$(CONNMAN).$(CONNMAN_SUFFIX)
CONNMAN_DIR := $(BUILDDIR)/$(CONNMAN)
-CONNMAN_LICENSE := GPL-2.0
+CONNMAN_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/coreutils.make b/rules/coreutils.make
index 32601ad67..e36767a81 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -23,7 +23,7 @@ COREUTILS_SUFFIX := tar.xz
COREUTILS_URL := $(call ptx/mirror, GNU, coreutils/$(COREUTILS).$(COREUTILS_SUFFIX))
COREUTILS_SOURCE := $(SRCDIR)/$(COREUTILS).$(COREUTILS_SUFFIX)
COREUTILS_DIR := $(BUILDDIR)/$(COREUTILS)
-COREUTILS_LICENSE := GPL-3.0
+COREUTILS_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
index bb865aa9a..fe706769f 100644
--- a/rules/cryptsetup.make
+++ b/rules/cryptsetup.make
@@ -23,7 +23,7 @@ CRYPTSETUP_SUFFIX := tar.gz
CRYPTSETUP_URL := https://www.kernel.org/pub/linux/utils/cryptsetup/v$(basename $(CRYPTSETUP_VERSION))/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
CRYPTSETUP_SOURCE := $(SRCDIR)/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
CRYPTSETUP_DIR := $(BUILDDIR)/$(CRYPTSETUP)
-CRYPTSETUP_LICENSE := GPL-2.0+
+CRYPTSETUP_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/cups-filters.make b/rules/cups-filters.make
index e00954aae..a028bb5b7 100644
--- a/rules/cups-filters.make
+++ b/rules/cups-filters.make
@@ -23,7 +23,7 @@ CUPS_FILTERS_SUFFIX := tar.xz
CUPS_FILTERS_URL := http://openprinting.org/download/cups-filters/$(CUPS_FILTERS).$(CUPS_FILTERS_SUFFIX)
CUPS_FILTERS_SOURCE := $(SRCDIR)/$(CUPS_FILTERS).$(CUPS_FILTERS_SUFFIX)
CUPS_FILTERS_DIR := $(BUILDDIR)/$(CUPS_FILTERS)
-CUPS_FILTERS_LICENSE := GPL-2.0 AND GPL-2.0+ AND GPL-3.0 AND GPL-3.0+ AND LGPL-2 AND LGPL-2.1+ AND MIT AND BSD-4-Clause
+CUPS_FILTERS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2 AND LGPL-2.1-or-later AND MIT AND BSD-4-Clause
CUPS_FILTERS_LICENSE_FILES := file://COPYING;md5=794bc12f02f100806cd5f19304d03f7b
# ----------------------------------------------------------------------------
diff --git a/rules/cups.make b/rules/cups.make
index c9d8e4e35..2f8e752e4 100644
--- a/rules/cups.make
+++ b/rules/cups.make
@@ -23,7 +23,7 @@ CUPS_SUFFIX := tar.gz
CUPS_URL := https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)/$(CUPS)-source.$(CUPS_SUFFIX)
CUPS_SOURCE := $(SRCDIR)/$(CUPS)-source.$(CUPS_SUFFIX)
CUPS_DIR := $(BUILDDIR)/cups-$(CUPS_VERSION)
-CUPS_LICENSE := LGPL-2.0 AND GPL-2.0
+CUPS_LICENSE := LGPL-2.0-only AND GPL-2.0-only
CUPS_LICENSE_FILES := file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460
# ----------------------------------------------------------------------------
diff --git a/rules/cxxtools.make b/rules/cxxtools.make
index 80dcf0e70..8d7b67842 100644
--- a/rules/cxxtools.make
+++ b/rules/cxxtools.make
@@ -23,7 +23,7 @@ CXXTOOLS_SUFFIX := tar.gz
CXXTOOLS_URL := http://www.tntnet.org/download/$(CXXTOOLS).$(CXXTOOLS_SUFFIX)
CXXTOOLS_SOURCE := $(SRCDIR)/$(CXXTOOLS).$(CXXTOOLS_SUFFIX)
CXXTOOLS_DIR := $(BUILDDIR)/$(CXXTOOLS)
-CXXTOOLS_LICENSE := LGPL-2.1
+CXXTOOLS_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dbus-glib.make b/rules/dbus-glib.make
index 4e4891afd..c2d3ac8ea 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 AND GPL-2.0+
+DBUS_GLIB_LICENSE := AFL-2.1 AND GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dbus-python.make b/rules/dbus-python.make
index 0b283f147..e8ddfdc68 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 AND GPL-2.0+
+DBUS_PYTHON_LICENSE := AFL-2.1 AND GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dbus.make b/rules/dbus.make
index 83f9d559a..700681cfc 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 AND GPL-2.0+
+DBUS_LICENSE := AFL-2.1 AND GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dconf.make b/rules/dconf.make
index eaef895d1..71c2fba51 100644
--- a/rules/dconf.make
+++ b/rules/dconf.make
@@ -23,7 +23,7 @@ DCONF_SUFFIX := tar.bz2
DCONF_URL := http://download.gnome.org/sources/dconf/0.9/$(DCONF).$(DCONF_SUFFIX)
DCONF_SOURCE := $(SRCDIR)/$(DCONF).$(DCONF_SUFFIX)
DCONF_DIR := $(BUILDDIR)/$(DCONF)
-DCONF_LICENSE := LGPL-2.1
+DCONF_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dfu-util.make b/rules/dfu-util.make
index 270f626fa..18c4cc149 100644
--- a/rules/dfu-util.make
+++ b/rules/dfu-util.make
@@ -23,7 +23,7 @@ DFU_UTIL_SUFFIX := tar.gz
DFU_UTIL_URL := http://dfu-util.gnumonks.org/releases/$(DFU_UTIL).$(DFU_UTIL_SUFFIX)
DFU_UTIL_SOURCE := $(SRCDIR)/$(DFU_UTIL).$(DFU_UTIL_SUFFIX)
DFU_UTIL_DIR := $(BUILDDIR)/$(DFU_UTIL)
-DFU_UTIL_LICENSE := GPL-2.0
+DFU_UTIL_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dhcp-helper.make b/rules/dhcp-helper.make
index d9c72f9ca..b9e65b931 100644
--- a/rules/dhcp-helper.make
+++ b/rules/dhcp-helper.make
@@ -23,7 +23,7 @@ DHCP_HELPER_SUFFIX := tar.gz
DHCP_HELPER_URL := http://www.thekelleys.org.uk/dhcp-helper/$(DHCP_HELPER).$(DHCP_HELPER_SUFFIX)
DHCP_HELPER_SOURCE := $(SRCDIR)/$(DHCP_HELPER).$(DHCP_HELPER_SUFFIX)
DHCP_HELPER_DIR := $(BUILDDIR)/$(DHCP_HELPER)
-DHCP_HELPER_LICENSE := GPL-2.0
+DHCP_HELPER_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dhex.make b/rules/dhex.make
index 9242f330c..1c44acd5a 100644
--- a/rules/dhex.make
+++ b/rules/dhex.make
@@ -23,7 +23,7 @@ DHEX_SUFFIX := tar.gz
DHEX_URL := http://www.dettus.net/dhex/$(DHEX).$(DHEX_SUFFIX)
DHEX_SOURCE := $(SRCDIR)/$(DHEX).$(DHEX_SUFFIX)
DHEX_DIR := $(BUILDDIR)/$(DHEX)
-DHEX_LICENSE := GPL-2.0
+DHEX_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dialog.make b/rules/dialog.make
index 790f77742..d370bd052 100644
--- a/rules/dialog.make
+++ b/rules/dialog.make
@@ -23,7 +23,7 @@ DIALOG_SUFFIX := tgz
DIALOG_URL := ftp://ftp.invisible-island.net/dialog/$(DIALOG).$(DIALOG_SUFFIX)
DIALOG_SOURCE := $(SRCDIR)/$(DIALOG).$(DIALOG_SUFFIX)
DIALOG_DIR := $(BUILDDIR)/$(DIALOG)
-DIALOG_LICENSE := LGPL-2.1
+DIALOG_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dibbler.make b/rules/dibbler.make
index 832370c9c..42c12b5bd 100644
--- a/rules/dibbler.make
+++ b/rules/dibbler.make
@@ -23,7 +23,7 @@ DIBBLER_SUFFIX := tar.gz
DIBBLER_URL := http://klub.com.pl/dhcpv6/dibbler/$(DIBBLER)-src.$(DIBBLER_SUFFIX)
DIBBLER_SOURCE := $(SRCDIR)/$(DIBBLER)-src.$(DIBBLER_SUFFIX)
DIBBLER_DIR := $(BUILDDIR)/$(DIBBLER)
-DIBBLER_LICENSE := GPL-2.0
+DIBBLER_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dosfstools.make b/rules/dosfstools.make
index be65bdaa3..df475149a 100644
--- a/rules/dosfstools.make
+++ b/rules/dosfstools.make
@@ -25,7 +25,7 @@ DOSFSTOOLS_SRC := $(DOSFSTOOLS).$(DOSFSTOOLS_SUFFIX)
DOSFSTOOLS_URL := https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)/$(DOSFSTOOLS_SRC)
DOSFSTOOLS_SOURCE := $(SRCDIR)/$(DOSFSTOOLS_SRC)
DOSFSTOOLS_DIR := $(BUILDDIR)/$(DOSFSTOOLS)
-DOSFSTOOLS_LICENSE := GPL-3.0
+DOSFSTOOLS_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare (nothing to be done here)
diff --git a/rules/dropwatch.make b/rules/dropwatch.make
index 801515821..418cf620e 100644
--- a/rules/dropwatch.make
+++ b/rules/dropwatch.make
@@ -24,7 +24,7 @@ DROPWATCH_SUFFIX := tar.gz
DROPWATCH_URL := git://git.infradead.org/users/nhorman/dropwatch.git;tag=$(DROPWATCH_VERSION)
DROPWATCH_SOURCE := $(SRCDIR)/$(DROPWATCH).$(DROPWATCH_SUFFIX)
DROPWATCH_DIR := $(BUILDDIR)/$(DROPWATCH)
-DROPWATCH_LICENSE := GPL-2.0
+DROPWATCH_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/dt-utils.make b/rules/dt-utils.make
index 67d3b49f3..0a86f4e5e 100644
--- a/rules/dt-utils.make
+++ b/rules/dt-utils.make
@@ -23,7 +23,7 @@ DT_UTILS_SUFFIX := tar.xz
DT_UTILS_URL := http://pengutronix.de/software/dt-utils/download/$(DT_UTILS).$(DT_UTILS_SUFFIX)
DT_UTILS_SOURCE := $(SRCDIR)/$(DT_UTILS).$(DT_UTILS_SUFFIX)
DT_UTILS_DIR := $(BUILDDIR)/$(DT_UTILS)
-DT_UTILS_LICENSE := GPL-2.0
+DT_UTILS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index f2fcc1a78..a6b0398b6 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+ AND LGPL-2.0+ AND BSD-3-Clause AND MIT
+E2FSPROGS_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later 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/easy-rsa.make b/rules/easy-rsa.make
index bbd09381c..4186f3e0a 100644
--- a/rules/easy-rsa.make
+++ b/rules/easy-rsa.make
@@ -24,7 +24,7 @@ EASY_RSA_TARBALL := $(EASY_RSA_VERSION).$(EASY_RSA_SUFFIX)
EASY_RSA_URL := https://github.com/OpenVPN/easy-rsa/archive/$(EASY_RSA_TARBALL)
EASY_RSA_SOURCE := $(SRCDIR)/$(EASY_RSA).$(EASY_RSA_SUFFIX)
EASY_RSA_DIR := $(BUILDDIR)/$(EASY_RSA)
-EASY_RSA_LICENSE := GPL-2.0
+EASY_RSA_LICENSE := GPL-2.0-only
EASY_RSA_INSTALL_SCRIPTS := \
build-ca build-dh build-inter build-key build-key-pass build-key-pkcs12 \
diff --git a/rules/ecryptfs-utils.make b/rules/ecryptfs-utils.make
index 5e33b98f4..46b813ebc 100644
--- a/rules/ecryptfs-utils.make
+++ b/rules/ecryptfs-utils.make
@@ -24,7 +24,7 @@ ECRYPTFS_UTILS_TARBALL := $(ECRYPTFS_UTILS).orig.$(ECRYPTFS_UTILS_SUFFIX)
ECRYPTFS_UTILS_URL := https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download/$(ECRYPTFS_UTILS_TARBALL)
ECRYPTFS_UTILS_SOURCE := $(SRCDIR)/$(ECRYPTFS_UTILS).$(ECRYPTFS_UTILS_SUFFIX)
ECRYPTFS_UTILS_DIR := $(BUILDDIR)/$(ECRYPTFS_UTILS)
-ECRYPTFS_UTILS_LICENSE := GPL-2.0
+ECRYPTFS_UTILS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ed.make b/rules/ed.make
index bff013ac6..e1c015547 100644
--- a/rules/ed.make
+++ b/rules/ed.make
@@ -23,7 +23,7 @@ ED_SUFFIX := tar.gz
ED_URL := $(call ptx/mirror, GNU, ed/$(ED).$(ED_SUFFIX))
ED_SOURCE := $(SRCDIR)/$(ED).$(ED_SUFFIX)
ED_DIR := $(BUILDDIR)/$(ED)
-ED_LICENSE := GPL-3.0
+ED_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/eggdbus.make b/rules/eggdbus.make
index 1023e7d97..a35239d7b 100644
--- a/rules/eggdbus.make
+++ b/rules/eggdbus.make
@@ -23,7 +23,7 @@ EGGDBUS_SUFFIX := tar.gz
EGGDBUS_URL := http://hal.freedesktop.org/releases/$(EGGDBUS).$(EGGDBUS_SUFFIX)
EGGDBUS_SOURCE := $(SRCDIR)/$(EGGDBUS).$(EGGDBUS_SUFFIX)
EGGDBUS_DIR := $(BUILDDIR)/$(EGGDBUS)
-EGGDBUS_LICENSE := LGPL-2.0
+EGGDBUS_LICENSE := LGPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ethtool.make b/rules/ethtool.make
index f1ec9e777..ef39b2873 100644
--- a/rules/ethtool.make
+++ b/rules/ethtool.make
@@ -24,7 +24,7 @@ ETHTOOL := ethtool-$(ETHTOOL_VERSION)
ETHTOOL_URL := $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX))
ETHTOOL_SOURCE := $(SRCDIR)/$(ETHTOOL).$(ETHTOOL_SUFFIX)
ETHTOOL_DIR := $(BUILDDIR)/$(ETHTOOL)
-ETHTOOL_LICENSE := GPL-2.0
+ETHTOOL_LICENSE := GPL-2.0-only
ETHTOOL_LICENSE_FILES := \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
diff --git a/rules/evtest.make b/rules/evtest.make
index 5ab65250b..df5d4f74e 100644
--- a/rules/evtest.make
+++ b/rules/evtest.make
@@ -23,7 +23,7 @@ EVTEST_SUFFIX := tar.bz2
EVTEST_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(EVTEST).$(EVTEST_SUFFIX)
EVTEST_SOURCE := $(SRCDIR)/$(EVTEST).$(EVTEST_SUFFIX)
EVTEST_DIR := $(BUILDDIR)/$(EVTEST)
-EVTEST_LICENSE := GPL-2.0
+EVTEST_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/f2fs-tools.make b/rules/f2fs-tools.make
index 5efbc7a3d..3df61c6f8 100644
--- a/rules/f2fs-tools.make
+++ b/rules/f2fs-tools.make
@@ -25,7 +25,7 @@ F2FS_TOOLS_SUFFIX := tar.xz
F2FS_TOOLS_URL := git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;tag=v$(F2FS_TOOLS_VERSION)
F2FS_TOOLS_SOURCE := $(SRCDIR)/$(F2FS_TOOLS).$(F2FS_TOOLS_SUFFIX)
F2FS_TOOLS_DIR := $(BUILDDIR)/$(F2FS_TOOLS)
-F2FS_TOOLS_LICENSE := GPL-2.0+ LGPL-2.1+
+F2FS_TOOLS_LICENSE := GPL-2.0-or-later LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/fbset.make b/rules/fbset.make
index 7d2549606..8f63e1e14 100644
--- a/rules/fbset.make
+++ b/rules/fbset.make
@@ -24,7 +24,7 @@ FBSET_SUFFIX := tar.gz
FBSET_URL := http://users.telenet.be/geertu/Linux/fbdev/$(FBSET).$(FBSET_SUFFIX)
FBSET_SOURCE := $(SRCDIR)/$(FBSET).$(FBSET_SUFFIX)
FBSET_DIR := $(BUILDDIR)/$(FBSET)
-FBSET_LICENSE := GPL-2.0
+FBSET_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Compile
diff --git a/rules/fbterm.make b/rules/fbterm.make
index b506e60c8..02003b0ed 100644
--- a/rules/fbterm.make
+++ b/rules/fbterm.make
@@ -23,7 +23,7 @@ FBTERM_SUFFIX := tar.gz
FBTERM_URL := https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/$(FBTERM).$(FBTERM_SUFFIX)
FBTERM_SOURCE := $(SRCDIR)/$(FBTERM).$(FBTERM_SUFFIX)
FBTERM_DIR := $(BUILDDIR)/$(FBTERM)
-FBTERM_LICENSE := GPL-2.0
+FBTERM_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/fbtest.make b/rules/fbtest.make
index 4defcab0f..79829f582 100644
--- a/rules/fbtest.make
+++ b/rules/fbtest.make
@@ -24,7 +24,7 @@ FBTEST_SUFFIX := tar.gz
FBTEST_URL := https://git.kernel.org/pub/scm/linux/kernel/git/geert/fbtest.git;tag=$(FBTEST_VERSION)
FBTEST_SOURCE := $(SRCDIR)/$(FBTEST).$(FBTEST_SUFFIX)
FBTEST_DIR := $(BUILDDIR)/$(FBTEST)
-FBTEST_LICENSE := GPL-2.0
+FBTEST_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Compile
diff --git a/rules/fbutils.make b/rules/fbutils.make
index 8d050a168..195140aee 100644
--- a/rules/fbutils.make
+++ b/rules/fbutils.make
@@ -23,7 +23,7 @@ FBUTILS_SUFFIX := tar.gz
FBUTILS_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(FBUTILS).$(FBUTILS_SUFFIX)
FBUTILS_SOURCE := $(SRCDIR)/$(FBUTILS).$(FBUTILS_SUFFIX)
FBUTILS_DIR := $(BUILDDIR)/$(FBUTILS)
-FBUTILS_LICENSE := GPL-3.0
+FBUTILS_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Compile
diff --git a/rules/fbv.make b/rules/fbv.make
index 0880d2898..90391b929 100644
--- a/rules/fbv.make
+++ b/rules/fbv.make
@@ -24,7 +24,7 @@ FBV_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(FBV).$(FB
#FBV_URL := http://s-tech.elsat.net.pl/fbv/$(FBV).$(FBV_SUFFIX)
FBV_SOURCE := $(SRCDIR)/$(FBV).$(FBV_SUFFIX)
FBV_DIR := $(BUILDDIR)/$(FBV)
-FBV_LICENSE := GPL-2.0+
+FBV_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/freetype.make b/rules/freetype.make
index 0d35b99a1..05719c399 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 AND FTL AND GPL-2.0+
+FREETYPE_LICENSE := BSD-2-Clause AND FTL AND GPL-2.0-or-later
FREETYPE_LICENSE_FILES := \
file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \
file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \
diff --git a/rules/fuse.make b/rules/fuse.make
index a07a1fc4f..5fd3e2ade 100644
--- a/rules/fuse.make
+++ b/rules/fuse.make
@@ -23,7 +23,7 @@ FUSE_SUFFIX := tar.gz
FUSE_URL := https://github.com/libfuse/libfuse/releases/download/fuse_$(subst .,_,$(FUSE_VERSION))/$(FUSE).$(FUSE_SUFFIX)
FUSE_SOURCE := $(SRCDIR)/$(FUSE).$(FUSE_SUFFIX)
FUSE_DIR := $(BUILDDIR)/$(FUSE)
-FUSE_LICENSE := GPL-2.0 AND LGPL-2.1
+FUSE_LICENSE := GPL-2.0-only AND LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gdb.make b/rules/gdb.make
index a24792242..c0a36831c 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -24,7 +24,7 @@ GDB := gdb-$(GDB_VERSION)
GDB_SUFFIX := tar.gz
GDB_SOURCE := $(SRCDIR)/$(GDB).$(GDB_SUFFIX)
GDB_DIR := $(BUILDDIR)/$(GDB)
-GDB_LICENSE := GPL-3.0+
+GDB_LICENSE := GPL-3.0-or-later
GDB_URL := \
$(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX)) \
diff --git a/rules/gdbserver.make b/rules/gdbserver.make
index 881504657..283216842 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 AND GPL-3.0+
+GDBSERVER_LICENSE := GPL-2.0-only AND GPL-3.0-or-later
GDBSERVER_LICENSE_FILES := \
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
diff --git a/rules/gdk-pixbuf.make b/rules/gdk-pixbuf.make
index 8cadafaac..96e74e8a4 100644
--- a/rules/gdk-pixbuf.make
+++ b/rules/gdk-pixbuf.make
@@ -23,7 +23,7 @@ GDK_PIXBUF_SUFFIX := tar.bz2
GDK_PIXBUF_URL := http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.24/$(GDK_PIXBUF).$(GDK_PIXBUF_SUFFIX)
GDK_PIXBUF_SOURCE := $(SRCDIR)/$(GDK_PIXBUF).$(GDK_PIXBUF_SUFFIX)
GDK_PIXBUF_DIR := $(BUILDDIR)/$(GDK_PIXBUF)
-GDK_PIXBUF_LICENSE := LGPL-2.0
+GDK_PIXBUF_LICENSE := LGPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gettext.make b/rules/gettext.make
index 5ce806a3f..d9ee29b68 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+ AND LGPL-2.1+
+GETTEXT_LICENSE := GPL-3.0-or-later AND LGPL-2.1-or-later
GETTEXT_LICENSE_FILES := \
file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://gettext-runtime/intl/COPYING.LIB;md5=a4b192f7208753fc0fc8d88c733e6106 \
diff --git a/rules/glib-networking.make b/rules/glib-networking.make
index 01367fb14..4820cec25 100644
--- a/rules/glib-networking.make
+++ b/rules/glib-networking.make
@@ -23,7 +23,7 @@ GLIB_NETWORKING_SUFFIX := tar.xz
GLIB_NETWORKING_URL := http://ftp.gnome.org/pub/GNOME/sources/glib-networking/$(basename $(GLIB_NETWORKING_VERSION))/$(GLIB_NETWORKING).$(GLIB_NETWORKING_SUFFIX)
GLIB_NETWORKING_SOURCE := $(SRCDIR)/$(GLIB_NETWORKING).$(GLIB_NETWORKING_SUFFIX)
GLIB_NETWORKING_DIR := $(BUILDDIR)/$(GLIB_NETWORKING)
-GLIB_NETWORKING_LICENSE := LGPL-2.0+
+GLIB_NETWORKING_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/glib.make b/rules/glib.make
index 5d2c11fe6..60a1d97bc 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -26,7 +26,7 @@ GLIB_DIR := $(BUILDDIR)/$(GLIB)
GLIB_URL := http://ftp.gnome.org/pub/GNOME/sources/glib/$(basename $(GLIB_VERSION))/glib-$(GLIB_VERSION).$(GLIB_SUFFIX)
-GLIB_LICENSE := LGPL-2.0+
+GLIB_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/glmark2.make b/rules/glmark2.make
index 0f09bbf71..886fd31ce 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 AND SGIv1
+GLMARK2_LICENSE := GPL-3.0-only AND SGIv1
GLMARK2_LICENSE_FILES := \
file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.SGI;md5=7125c8894bd29eddfd44ede5ce3ab1e4
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 78a331673..4b1923992 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -24,7 +24,7 @@ GNUPG_SUFFIX := tar.bz2
GNUPG_URL := ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
GNUPG_SOURCE := $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
GNUPG_DIR := $(BUILDDIR)/$(GNUPG)
-GNUPG_LICENSE := GPL-3.0+
+GNUPG_LICENSE := GPL-3.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gnutls.make b/rules/gnutls.make
index dcc0bb47f..24daa6917 100644
--- a/rules/gnutls.make
+++ b/rules/gnutls.make
@@ -23,7 +23,7 @@ GNUTLS_SUFFIX := tar.xz
GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v$(basename $(GNUTLS_VERSION))/$(GNUTLS).$(GNUTLS_SUFFIX)
GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
-GNUTLS_LICENSE := LGPL-3.0+
+GNUTLS_LICENSE := LGPL-3.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gobject-introspection.make b/rules/gobject-introspection.make
index ba8e73662..3375293d4 100644
--- a/rules/gobject-introspection.make
+++ b/rules/gobject-introspection.make
@@ -23,7 +23,7 @@ GOBJECT_INTROSPECTION_SUFFIX := tar.xz
GOBJECT_INTROSPECTION_URL := http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(basename $(GOBJECT_INTROSPECTION_VERSION))/$(GOBJECT_INTROSPECTION).$(GOBJECT_INTROSPECTION_SUFFIX)
GOBJECT_INTROSPECTION_SOURCE := $(SRCDIR)/$(GOBJECT_INTROSPECTION).$(GOBJECT_INTROSPECTION_SUFFIX)
GOBJECT_INTROSPECTION_DIR := $(BUILDDIR)/$(GOBJECT_INTROSPECTION)
-GOBJECT_INTROSPECTION_LICENSE := LGPL-2.1+ AND GPL-2.0+
+GOBJECT_INTROSPECTION_LICENSE := LGPL-2.1-or-later AND GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gpm.make b/rules/gpm.make
index ff148b891..4d7e6991b 100644
--- a/rules/gpm.make
+++ b/rules/gpm.make
@@ -20,7 +20,7 @@ GPM_SUFFIX := tar.bz2
GPM_URL := http://www.nico.schottelius.org/software/gpm/archives/$(GPM).$(GPM_SUFFIX)
GPM_SOURCE := $(SRCDIR)/$(GPM).$(GPM_SUFFIX)
GPM_DIR := $(BUILDDIR)/$(GPM)
-GPM_LICENSE := GPL-2.0+
+GPM_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gst-plugins-bad1.make b/rules/gst-plugins-bad1.make
index 4459c77c6..fe3512c30 100644
--- a/rules/gst-plugins-bad1.make
+++ b/rules/gst-plugins-bad1.make
@@ -24,7 +24,7 @@ GST_PLUGINS_BAD1_SUFFIX := tar.xz
GST_PLUGINS_BAD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD1).$(GST_PLUGINS_BAD1_SUFFIX)
GST_PLUGINS_BAD1_SOURCE := $(SRCDIR)/$(GST_PLUGINS_BAD1).$(GST_PLUGINS_BAD1_SUFFIX)
GST_PLUGINS_BAD1_DIR := $(BUILDDIR)/$(GST_PLUGINS_BAD1)
-GST_PLUGINS_BAD1_LICENSE := LGPL-2.1+
+GST_PLUGINS_BAD1_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
diff --git a/rules/gst-plugins-base.make b/rules/gst-plugins-base.make
index a22d90ecd..b23b84fe7 100644
--- a/rules/gst-plugins-base.make
+++ b/rules/gst-plugins-base.make
@@ -23,7 +23,7 @@ GST_PLUGINS_BASE_SUFFIX := tar.bz2
GST_PLUGINS_BASE_URL := http://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE).$(GST_PLUGINS_BASE_SUFFIX)
GST_PLUGINS_BASE_SOURCE := $(SRCDIR)/$(GST_PLUGINS_BASE).$(GST_PLUGINS_BASE_SUFFIX)
GST_PLUGINS_BASE_DIR := $(BUILDDIR)/$(GST_PLUGINS_BASE)
-GST_PLUGINS_BASE_LICENSE := LGPL-2.0+
+GST_PLUGINS_BASE_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gst-plugins-base1.make b/rules/gst-plugins-base1.make
index c93725203..c3854b141 100644
--- a/rules/gst-plugins-base1.make
+++ b/rules/gst-plugins-base1.make
@@ -23,7 +23,7 @@ GST_PLUGINS_BASE1_SUFFIX := tar.xz
GST_PLUGINS_BASE1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE1).$(GST_PLUGINS_BASE1_SUFFIX)
GST_PLUGINS_BASE1_SOURCE := $(SRCDIR)/$(GST_PLUGINS_BASE1).$(GST_PLUGINS_BASE1_SUFFIX)
GST_PLUGINS_BASE1_DIR := $(BUILDDIR)/$(GST_PLUGINS_BASE1)
-GST_PLUGINS_BASE1_LICENSE := LGPL-2.0+
+GST_PLUGINS_BASE1_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make
index 77a810294..d02a6fb03 100644
--- a/rules/gst-plugins-good1.make
+++ b/rules/gst-plugins-good1.make
@@ -23,7 +23,7 @@ GST_PLUGINS_GOOD1_SUFFIX := tar.xz
GST_PLUGINS_GOOD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD1).$(GST_PLUGINS_GOOD1_SUFFIX)
GST_PLUGINS_GOOD1_SOURCE := $(SRCDIR)/$(GST_PLUGINS_GOOD1).$(GST_PLUGINS_GOOD1_SUFFIX)
GST_PLUGINS_GOOD1_DIR := $(BUILDDIR)/$(GST_PLUGINS_GOOD1)
-GST_PLUGINS_GOOD1_LICENSE := LGPL-2.1+
+GST_PLUGINS_GOOD1_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gst-plugins-ugly1.make b/rules/gst-plugins-ugly1.make
index 47d16ec7a..745bfbd88 100644
--- a/rules/gst-plugins-ugly1.make
+++ b/rules/gst-plugins-ugly1.make
@@ -23,7 +23,7 @@ GST_PLUGINS_UGLY1_SUFFIX := tar.xz
GST_PLUGINS_UGLY1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-ugly/$(GST_PLUGINS_UGLY1).$(GST_PLUGINS_UGLY1_SUFFIX)
GST_PLUGINS_UGLY1_SOURCE := $(SRCDIR)/$(GST_PLUGINS_UGLY1).$(GST_PLUGINS_UGLY1_SUFFIX)
GST_PLUGINS_UGLY1_DIR := $(BUILDDIR)/$(GST_PLUGINS_UGLY1)
-GST_PLUGINS_UGLY1_LICENSE := LGPL-2.1+
+GST_PLUGINS_UGLY1_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gst-python1.make b/rules/gst-python1.make
index e8eba46ee..b5c3c9b77 100644
--- a/rules/gst-python1.make
+++ b/rules/gst-python1.make
@@ -24,7 +24,7 @@ GST_PYTHON1_URL := http://gstreamer.freedesktop.org/src/gst-python/$(GST_PYTHON
GST_PYTHON1_SOURCE := $(SRCDIR)/$(GST_PYTHON1).$(GST_PYTHON1_SUFFIX)
GST_PYTHON1_DIR := $(BUILDDIR)/$(GST_PYTHON1)
GST_PYTHON1_BUILD_OOT := YES
-GST_PYTHON1_LICENSE := LGPL-2.1+
+GST_PYTHON1_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gst-rtsp-server1.make b/rules/gst-rtsp-server1.make
index 14102be10..142821189 100644
--- a/rules/gst-rtsp-server1.make
+++ b/rules/gst-rtsp-server1.make
@@ -23,7 +23,7 @@ GST_RTSP_SERVER1_SUFFIX := tar.xz
GST_RTSP_SERVER1_URL := http://gstreamer.freedesktop.org/src/gst-rtsp/$(GST_RTSP_SERVER1).$(GST_RTSP_SERVER1_SUFFIX)
GST_RTSP_SERVER1_SOURCE := $(SRCDIR)/$(GST_RTSP_SERVER1).$(GST_RTSP_SERVER1_SUFFIX)
GST_RTSP_SERVER1_DIR := $(BUILDDIR)/$(GST_RTSP_SERVER1)
-GST_RTSP_SERVER1_LICENSE := LGPL-2.0+
+GST_RTSP_SERVER1_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gst-validate1.make b/rules/gst-validate1.make
index 23c791082..95d268654 100644
--- a/rules/gst-validate1.make
+++ b/rules/gst-validate1.make
@@ -23,7 +23,7 @@ GST_VALIDATE1_SUFFIX := tar.xz
GST_VALIDATE1_URL := http://gstreamer.freedesktop.org/data/src/gst-validate/$(GST_VALIDATE1).$(GST_VALIDATE1_SUFFIX)
GST_VALIDATE1_SOURCE := $(SRCDIR)/$(GST_VALIDATE1).$(GST_VALIDATE1_SUFFIX)
GST_VALIDATE1_DIR := $(BUILDDIR)/$(GST_VALIDATE1)
-GST_VALIDATE1_LICENSE := LGPL-2.1+
+GST_VALIDATE1_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gstreamer-vaapi1.make b/rules/gstreamer-vaapi1.make
index 870cd20c6..49cef7a99 100644
--- a/rules/gstreamer-vaapi1.make
+++ b/rules/gstreamer-vaapi1.make
@@ -23,7 +23,7 @@ GSTREAMER_VAAPI1_SUFFIX := tar.xz
GSTREAMER_VAAPI1_URL := http://gstreamer.freedesktop.org/src/gstreamer-vaapi/$(GSTREAMER_VAAPI1).$(GSTREAMER_VAAPI1_SUFFIX)
GSTREAMER_VAAPI1_SOURCE := $(SRCDIR)/$(GSTREAMER_VAAPI1).$(GSTREAMER_VAAPI1_SUFFIX)
GSTREAMER_VAAPI1_DIR := $(BUILDDIR)/$(GSTREAMER_VAAPI1)
-GSTREAMER_VAAPI1_LICENSE := LGPL-2.0+
+GSTREAMER_VAAPI1_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gstreamer.make b/rules/gstreamer.make
index e2eaa9480..88370f06e 100644
--- a/rules/gstreamer.make
+++ b/rules/gstreamer.make
@@ -24,7 +24,7 @@ GSTREAMER_SUFFIX := tar.bz2
GSTREAMER_URL := http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER).$(GSTREAMER_SUFFIX)
GSTREAMER_SOURCE := $(SRCDIR)/$(GSTREAMER).$(GSTREAMER_SUFFIX)
GSTREAMER_DIR := $(BUILDDIR)/$(GSTREAMER)
-GSTREAMER_LICENSE := LGPL-2.0+
+GSTREAMER_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gstreamer1.make b/rules/gstreamer1.make
index 39c3268b7..bbf55192c 100644
--- a/rules/gstreamer1.make
+++ b/rules/gstreamer1.make
@@ -24,7 +24,7 @@ GSTREAMER1_SUFFIX := tar.xz
GSTREAMER1_URL := http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER1).$(GSTREAMER1_SUFFIX)
GSTREAMER1_SOURCE := $(SRCDIR)/$(GSTREAMER1).$(GSTREAMER1_SUFFIX)
GSTREAMER1_DIR := $(BUILDDIR)/$(GSTREAMER1)
-GSTREAMER1_LICENSE := LGPL-2.1+
+GSTREAMER1_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gtk.make b/rules/gtk.make
index 98e533295..db7d357d5 100644
--- a/rules/gtk.make
+++ b/rules/gtk.make
@@ -23,7 +23,7 @@ GTK_SUFFIX := tar.bz2
GTK_URL := http://ftp.gtk.org/pub/gtk/3.2/$(GTK).$(GTK_SUFFIX)
GTK_SOURCE := $(SRCDIR)/$(GTK).$(GTK_SUFFIX)
GTK_DIR := $(BUILDDIR)/$(GTK)
-GTK_LICENSE := LGPL-2.0
+GTK_LICENSE := LGPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gzip.make b/rules/gzip.make
index fd6fedf03..973af66c7 100644
--- a/rules/gzip.make
+++ b/rules/gzip.make
@@ -23,7 +23,7 @@ GZIP_SUFFIX := tar.xz
GZIP_URL := $(call ptx/mirror, GNU, gzip/$(GZIP).$(GZIP_SUFFIX))
GZIP_SOURCE := $(SRCDIR)/$(GZIP).$(GZIP_SUFFIX)
GZIP_DIR := $(BUILDDIR)/$(GZIP)
-GZIP_LICENSE := GPL-3.0
+GZIP_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/haveged.make b/rules/haveged.make
index 42fae96c9..5aef5df9f 100644
--- a/rules/haveged.make
+++ b/rules/haveged.make
@@ -25,7 +25,7 @@ HAVEGED_URL := \
http://www.issihosts.com/haveged/archive/$(HAVEGED).$(HAVEGED_SUFFIX)
HAVEGED_SOURCE := $(SRCDIR)/$(HAVEGED).$(HAVEGED_SUFFIX)
HAVEGED_DIR := $(BUILDDIR)/$(HAVEGED)
-HAVEGED_LICENSE := GPL-3.0
+HAVEGED_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/hexedit.make b/rules/hexedit.make
index 5253f2a50..4d93a163c 100644
--- a/rules/hexedit.make
+++ b/rules/hexedit.make
@@ -25,7 +25,7 @@ HEXEDIT_SUFFIX := tar.gz
HEXEDIT_URL := https://github.com/pixel/hexedit/archive/$(HEXEDIT_VERSION).$(HEXEDIT_SUFFIX)
HEXEDIT_SOURCE := $(SRCDIR)/$(HEXEDIT).$(HEXEDIT_SUFFIX)
HEXEDIT_DIR := $(BUILDDIR)/$(HEXEDIT)
-HEXEDIT_LICENSE := GPL-2.0+
+HEXEDIT_LICENSE := GPL-2.0-or-later
#
# autoconf
diff --git a/rules/host-autotools-autoconf.make b/rules/host-autotools-autoconf.make
index fe7aa3a89..b063fb529 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 AND GPL-3.0 AND Autoconf-exception-3.0
+HOST_AUTOTOOLS_AUTOCONF_LICENSE := GPL-2.0-only AND GPL-3.0-only AND Autoconf-exception-3.0
HOST_AUTOTOOLS_AUTOCONF_LICENSE_FILES := \
file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
diff --git a/rules/host-autotools-automake.make b/rules/host-autotools-automake.make
index 5827a63fb..2f1478608 100644
--- a/rules/host-autotools-automake.make
+++ b/rules/host-autotools-automake.make
@@ -24,7 +24,7 @@ HOST_AUTOTOOLS_AUTOMAKE_URL := $(call ptx/mirror, GNU, automake/$(HOST_AUTOTOOLS
HOST_AUTOTOOLS_AUTOMAKE_SOURCE := $(SRCDIR)/$(HOST_AUTOTOOLS_AUTOMAKE).$(HOST_AUTOTOOLS_AUTOMAKE_SUFFIX)
HOST_AUTOTOOLS_AUTOMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_AUTOTOOLS_AUTOMAKE)
HOST_AUTOTOOLS_AUTOMAKE_DEVPKG := NO
-HOST_AUTOTOOLS_AUTOMAKE_LICENSE := GPL-2.0
+HOST_AUTOTOOLS_AUTOMAKE_LICENSE := GPL-2.0-only
$(STATEDIR)/autogen-tools: $(STATEDIR)/host-autotools-automake.install.post
diff --git a/rules/host-autotools-libtool.make b/rules/host-autotools-libtool.make
index 907c5560f..2081eae40 100644
--- a/rules/host-autotools-libtool.make
+++ b/rules/host-autotools-libtool.make
@@ -24,7 +24,7 @@ HOST_AUTOTOOLS_LIBTOOL_URL := $(call ptx/mirror, GNU, libtool/$(HOST_AUTOTOOLS_L
HOST_AUTOTOOLS_LIBTOOL_SOURCE := $(SRCDIR)/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX)
HOST_AUTOTOOLS_LIBTOOL_DIR := $(HOST_BUILDDIR)/$(HOST_AUTOTOOLS_LIBTOOL)
HOST_AUTOTOOLS_LIBTOOL_DEVPKG := NO
-HOST_AUTOTOOLS_LIBTOOL_LICENSE := GPL-2.0+
+HOST_AUTOTOOLS_LIBTOOL_LICENSE := GPL-2.0-or-later
$(STATEDIR)/autogen-tools: $(STATEDIR)/host-autotools-libtool.install.post
diff --git a/rules/host-chrpath.make b/rules/host-chrpath.make
index 60117238c..8100fe113 100644
--- a/rules/host-chrpath.make
+++ b/rules/host-chrpath.make
@@ -23,7 +23,7 @@ HOST_CHRPATH_SUFFIX := tar.gz
HOST_CHRPATH_URL := https://alioth.debian.org/frs/download.php/file/3979/$(HOST_CHRPATH).$(HOST_CHRPATH_SUFFIX)
HOST_CHRPATH_SOURCE := $(SRCDIR)/$(HOST_CHRPATH).$(HOST_CHRPATH_SUFFIX)
HOST_CHRPATH_DIR := $(HOST_BUILDDIR)/$(HOST_CHRPATH)
-HOST_CHRPATH_LICENSE := GPL-2.0
+HOST_CHRPATH_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-elf-h-compat.make b/rules/host-elf-h-compat.make
index 50e483cd7..94c087874 100644
--- a/rules/host-elf-h-compat.make
+++ b/rules/host-elf-h-compat.make
@@ -23,7 +23,7 @@ HOST_ELF_H_COMPAT_SUFFIX := tar.bz2
HOST_ELF_H_COMPAT_URL := http://bwalle.de/programme/$(HOST_ELF_H_COMPAT).$(HOST_ELF_H_COMPAT_SUFFIX)
HOST_ELF_H_COMPAT_SOURCE := $(SRCDIR)/$(HOST_ELF_H_COMPAT).$(HOST_ELF_H_COMPAT_SUFFIX)
HOST_ELF_H_COMPAT_DIR := $(HOST_BUILDDIR)/$(HOST_ELF_H_COMPAT)
-HOST_ELF_H_COMPAT_LICENSE := GPL-2.0+
+HOST_ELF_H_COMPAT_LICENSE := GPL-2.0-or-later
#
# autoconf
diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make
index 21392deb6..e0ffb52ef 100644
--- a/rules/host-fakeroot.make
+++ b/rules/host-fakeroot.make
@@ -25,7 +25,7 @@ HOST_FAKEROOT_TARBALL := fakeroot_$(HOST_FAKEROOT_VERSION).orig.$(HOST_FAKEROOT_
HOST_FAKEROOT_URL := $(call ptx/mirror, DEB, pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL))
HOST_FAKEROOT_SOURCE := $(SRCDIR)/$(HOST_FAKEROOT_TARBALL)
HOST_FAKEROOT_DIR := $(HOST_BUILDDIR)/$(HOST_FAKEROOT)
-HOST_FAKEROOT_LICENSE := GPL-3.0+
+HOST_FAKEROOT_LICENSE := GPL-3.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-genext2fs.make b/rules/host-genext2fs.make
index c92bb435b..f00895727 100644
--- a/rules/host-genext2fs.make
+++ b/rules/host-genext2fs.make
@@ -25,7 +25,7 @@ HOST_GENEXT2FS_SUFFIX := tar.gz
HOST_GENEXT2FS_URL := $(call ptx/mirror, SF, genext2fs/$(HOST_GENEXT2FS).$(HOST_GENEXT2FS_SUFFIX))
HOST_GENEXT2FS_SOURCE := $(SRCDIR)/$(HOST_GENEXT2FS).$(HOST_GENEXT2FS_SUFFIX)
HOST_GENEXT2FS_DIR := $(HOST_BUILDDIR)/$(HOST_GENEXT2FS)
-HOST_GENEXT2FS_LICENSE := GPL-2.0
+HOST_GENEXT2FS_LICENSE := GPL-2.0-only
HOST_GENEXT2FS_LICENSE_FILES := \
file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
diff --git a/rules/host-genimage.make b/rules/host-genimage.make
index 46d6773fe..96e1e78e4 100644
--- a/rules/host-genimage.make
+++ b/rules/host-genimage.make
@@ -23,7 +23,7 @@ HOST_GENIMAGE_SUFFIX := tar.xz
HOST_GENIMAGE_URL := http://www.pengutronix.de/software/genimage/download/$(HOST_GENIMAGE).$(HOST_GENIMAGE_SUFFIX)
HOST_GENIMAGE_SOURCE := $(SRCDIR)/$(HOST_GENIMAGE).$(HOST_GENIMAGE_SUFFIX)
HOST_GENIMAGE_DIR := $(HOST_BUILDDIR)/$(HOST_GENIMAGE)
-HOST_GENIMAGE_LICENSE := GPL-2.0
+HOST_GENIMAGE_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-gperf.make b/rules/host-gperf.make
index 04af29fdb..5b1bf6604 100644
--- a/rules/host-gperf.make
+++ b/rules/host-gperf.make
@@ -23,7 +23,7 @@ HOST_GPERF_SUFFIX := tar.gz
HOST_GPERF_URL := $(call ptx/mirror, GNU, gperf/$(HOST_GPERF).$(HOST_GPERF_SUFFIX))
HOST_GPERF_SOURCE := $(SRCDIR)/$(HOST_GPERF).$(HOST_GPERF_SUFFIX)
HOST_GPERF_DIR := $(HOST_BUILDDIR)/$(HOST_GPERF)
-HOST_GPERF_LICENSE := GPL-3.0
+HOST_GPERF_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-gtk-doc.make b/rules/host-gtk-doc.make
index 6fb04a1e6..ccb6cae85 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 AND GFDL-1.1
+HOST_GTK_DOC_LICENSE := GPL-3.0-only AND GFDL-1.1-only
HOST_GTK_DOC_LICENSE_FILES := \
file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING-DOCS;md5=18ba770020b624031bc7c8a7b055d776
diff --git a/rules/host-intltool.make b/rules/host-intltool.make
index b7c5aaf9b..c7bb66435 100644
--- a/rules/host-intltool.make
+++ b/rules/host-intltool.make
@@ -23,7 +23,7 @@ HOST_INTLTOOL_SUFFIX := tar.gz
HOST_INTLTOOL_URL := http://launchpad.net/intltool/trunk/0.50.0/+download/$(HOST_INTLTOOL).$(HOST_INTLTOOL_SUFFIX)
HOST_INTLTOOL_SOURCE := $(SRCDIR)/$(HOST_INTLTOOL).$(HOST_INTLTOOL_SUFFIX)
HOST_INTLTOOL_DIR := $(HOST_BUILDDIR)/$(HOST_INTLTOOL)
-HOST_INTLTOOL_LICENSE := GPL-2.0
+HOST_INTLTOOL_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-kernel-header.make b/rules/host-kernel-header.make
index 0c846468a..15abb894a 100644
--- a/rules/host-kernel-header.make
+++ b/rules/host-kernel-header.make
@@ -28,7 +28,7 @@ HOST_KERNEL_HEADER_VERSION = $(KERNEL_HEADER_VERSION)
endif
HOST_KERNEL_HEADER_DIR = $(HOST_BUILDDIR)/kernel-header-$(HOST_KERNEL_HEADER_VERSION)
HOST_KERNEL_HEADER_PKGDIR = $(PKGDIR)/host-kernel-header-$(HOST_KERNEL_HEADER_VERSION)
-HOST_KERNEL_HEADER_LICENSE := GPL-2.0
+HOST_KERNEL_HEADER_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-localedef.make b/rules/host-localedef.make
index 337a8f585..8b59f7302 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+ AND GPL-2.0+
+HOST_LOCALEDEF_LICENSE := LGPL-2.1-or-later AND GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-lzop.make b/rules/host-lzop.make
index 82ed2e5c1..c023ef596 100644
--- a/rules/host-lzop.make
+++ b/rules/host-lzop.make
@@ -23,7 +23,7 @@ HOST_LZOP_SUFFIX := tar.gz
HOST_LZOP_URL := http://www.lzop.org/download/$(HOST_LZOP).$(HOST_LZOP_SUFFIX)
HOST_LZOP_SOURCE := $(SRCDIR)/$(HOST_LZOP).$(HOST_LZOP_SUFFIX)
HOST_LZOP_DIR := $(HOST_BUILDDIR)/$(HOST_LZOP)
-HOST_LZOP_LICENSE := GPL-2.0+
+HOST_LZOP_LICENSE := GPL-2.0-or-later
HOST_LZOP_LICENSE_FILES := file://COPYING;md5=dfeaf3dc4beef4f5a7bdbc35b197f39e
# ----------------------------------------------------------------------------
diff --git a/rules/host-m4.make b/rules/host-m4.make
index 5a734fe2b..461f3bab8 100644
--- a/rules/host-m4.make
+++ b/rules/host-m4.make
@@ -23,7 +23,7 @@ HOST_M4_SUFFIX := tar.xz
HOST_M4_URL := http://ftp.gnu.org/gnu/m4/$(HOST_M4).$(HOST_M4_SUFFIX)
HOST_M4_SOURCE := $(SRCDIR)/$(HOST_M4).$(HOST_M4_SUFFIX)
HOST_M4_DIR := $(HOST_BUILDDIR)/$(HOST_M4)
-HOST_M4_LICENSE := GPL-3.0
+HOST_M4_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-mtools.make b/rules/host-mtools.make
index 7b50a85fb..e05bf1d13 100644
--- a/rules/host-mtools.make
+++ b/rules/host-mtools.make
@@ -23,7 +23,7 @@ HOST_MTOOLS_SUFFIX := tar.bz2
HOST_MTOOLS_URL := $(call ptx/mirror, GNU, mtools/$(HOST_MTOOLS).$(HOST_MTOOLS_SUFFIX))
HOST_MTOOLS_SOURCE := $(SRCDIR)/$(HOST_MTOOLS).$(HOST_MTOOLS_SUFFIX)
HOST_MTOOLS_DIR := $(HOST_BUILDDIR)/$(HOST_MTOOLS)
-HOST_MTOOLS_LICENSE := GPL-3.0
+HOST_MTOOLS_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make
index 19fa98257..46767aa90 100644
--- a/rules/host-opkg-utils.make
+++ b/rules/host-opkg-utils.make
@@ -23,7 +23,7 @@ HOST_OPKG_UTILS_SUFFIX := tar.bz2
HOST_OPKG_UTILS_URL := https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX)
HOST_OPKG_UTILS_SOURCE := $(SRCDIR)/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX)
HOST_OPKG_UTILS_DIR := $(HOST_BUILDDIR)/$(HOST_OPKG_UTILS)
-HOST_OPKG_UTILS_LICENSE := GPL-2.0
+HOST_OPKG_UTILS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-pkg-config.make b/rules/host-pkg-config.make
index 3e7b54862..8f2873164 100644
--- a/rules/host-pkg-config.make
+++ b/rules/host-pkg-config.make
@@ -24,7 +24,7 @@ HOST_PKG_CONFIG_URL := http://pkgconfig.freedesktop.org/releases/$(HOST_PKG_CONF
HOST_PKG_CONFIG_SOURCE := $(SRCDIR)/$(HOST_PKG_CONFIG).$(HOST_PKG_CONFIG_SUFFIX)
HOST_PKG_CONFIG_DIR := $(HOST_BUILDDIR)/$(HOST_PKG_CONFIG)
HOST_PKG_CONFIG_DEVPKG := NO
-HOST_PKG_CONFIG_LICENSE := GPL-2.0
+HOST_PKG_CONFIG_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-qooxdoo.make b/rules/host-qooxdoo.make
index 1287dd23a..cd3c90ad9 100644
--- a/rules/host-qooxdoo.make
+++ b/rules/host-qooxdoo.make
@@ -23,7 +23,7 @@ HOST_QOOXDOO_SUFFIX := zip
HOST_QOOXDOO_URL := $(call ptx/mirror, SF, qooxdoo/$(HOST_QOOXDOO).$(HOST_QOOXDOO_SUFFIX))
HOST_QOOXDOO_SOURCE := $(SRCDIR)/$(HOST_QOOXDOO).$(HOST_QOOXDOO_SUFFIX)
HOST_QOOXDOO_DIR := $(HOST_BUILDDIR)/$(HOST_QOOXDOO)
-HOST_QOOXDOO_LICENSE := LGPL-2.1
+HOST_QOOXDOO_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/hping.make b/rules/hping.make
index 644861094..85ff20059 100644
--- a/rules/hping.make
+++ b/rules/hping.make
@@ -23,7 +23,7 @@ HPING_SUFFIX := tar.gz
HPING_URL := http://www.hping.org/$(HPING).$(HPING_SUFFIX)
HPING_SOURCE := $(SRCDIR)/$(HPING).$(HPING_SUFFIX)
HPING_DIR := $(BUILDDIR)/$(HPING)
-HPING_LICENSE := GPL-2.0
+HPING_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/htop.make b/rules/htop.make
index af624c7df..4d3505f29 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -24,7 +24,7 @@ HTOP_SUFFIX := tar.gz
HTOP_URL := http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
HTOP_SOURCE := $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX)
HTOP_DIR := $(BUILDDIR)/$(HTOP)
-HTOP_LICENSE := GPL-2.0
+HTOP_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/hub-ctrl.make b/rules/hub-ctrl.make
index 10a494ccc..3c3f3ef05 100644
--- a/rules/hub-ctrl.make
+++ b/rules/hub-ctrl.make
@@ -23,7 +23,7 @@ HUB_CTRL_SUFFIX := tar.bz2
HUB_CTRL_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(HUB_CTRL).$(HUB_CTRL_SUFFIX)
HUB_CTRL_SOURCE := $(SRCDIR)/$(HUB_CTRL).$(HUB_CTRL_SUFFIX)
HUB_CTRL_DIR := $(BUILDDIR)/$(HUB_CTRL)
-HUB_CTRL_LICENSE := GPL-2.0+
+HUB_CTRL_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/i2c-tools.make b/rules/i2c-tools.make
index 6b62788a4..dddc5a614 100644
--- a/rules/i2c-tools.make
+++ b/rules/i2c-tools.make
@@ -23,7 +23,7 @@ I2C_TOOLS_SUFFIX := tar.xz
I2C_TOOLS_URL := https://www.kernel.org/pub/software/utils/i2c-tools/$(I2C_TOOLS).$(I2C_TOOLS_SUFFIX)
I2C_TOOLS_SOURCE := $(SRCDIR)/$(I2C_TOOLS).$(I2C_TOOLS_SUFFIX)
I2C_TOOLS_DIR := $(BUILDDIR)/$(I2C_TOOLS)
-I2C_TOOLS_LICENSE := GPL-2.0+
+I2C_TOOLS_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/iftop.make b/rules/iftop.make
index 135ef1856..00d35eb4b 100644
--- a/rules/iftop.make
+++ b/rules/iftop.make
@@ -23,7 +23,7 @@ IFTOP_SUFFIX := tar.gz
IFTOP_URL := http://www.ex-parrot.com/pdw/iftop/download/$(IFTOP).$(IFTOP_SUFFIX)
IFTOP_SOURCE := $(SRCDIR)/$(IFTOP).$(IFTOP_SUFFIX)
IFTOP_DIR := $(BUILDDIR)/$(IFTOP)
-IFTOP_LICENSE := GPL-2.0+
+IFTOP_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
index 0d53d38c9..ed829a8c5 100644
--- a/rules/ima-evm-utils.make
+++ b/rules/ima-evm-utils.make
@@ -24,7 +24,7 @@ IMA_EVM_UTILS_SUFFIX := tar.gz
IMA_EVM_UTILS_URL := $(call ptx/mirror, SF, linux-ima/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX))
IMA_EVM_UTILS_SOURCE := $(SRCDIR)/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX)
IMA_EVM_UTILS_DIR := $(BUILDDIR)/$(IMA_EVM_UTILS)
-IMA_EVM_UTILS_LICENSE := LGPL-2.0+
+IMA_EVM_UTILS_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/iproute2.make b/rules/iproute2.make
index d0b29ef37..d28bea4cf 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -24,7 +24,7 @@ IPROUTE2_SUFFIX := tar.xz
IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
IPROUTE2_SOURCE := $(SRCDIR)/$(IPROUTE2).$(IPROUTE2_SUFFIX)
IPROUTE2_DIR := $(BUILDDIR)/$(IPROUTE2)
-IPROUTE2_LICENSE := GPL-2.0
+IPROUTE2_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/iptables.make b/rules/iptables.make
index f1ee3053e..fd829c57c 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -28,7 +28,7 @@ IPTABLES_SUFFIX := tar.bz2
IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX)
IPTABLES_SOURCE := $(SRCDIR)/$(IPTABLES).$(IPTABLES_SUFFIX)
IPTABLES_DIR := $(BUILDDIR)/$(IPTABLES)
-IPTABLES_LICENSE := GPL-2.0
+IPTABLES_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/iputils.make b/rules/iputils.make
index 9bd68fb45..7c84d5034 100644
--- a/rules/iputils.make
+++ b/rules/iputils.make
@@ -23,7 +23,7 @@ IPUTILS_SUFFIX := tar.gz
IPUTILS_URL := http://codeload.github.com/iputils/iputils/$(IPUTILS_SUFFIX)/$(IPUTILS_VERSION)
IPUTILS_SOURCE := $(SRCDIR)/$(IPUTILS).$(IPUTILS_SUFFIX)
IPUTILS_DIR := $(BUILDDIR)/$(IPUTILS)
-IPUTILS_LICENSE := GPL-2.0
+IPUTILS_LICENSE := GPL-2.0-only
IPUTILS_LICENSE_FILES := file://ninfod/COPYING;md5=5e9a325527978995c41e6d9a83f6e6bd
# ----------------------------------------------------------------------------
diff --git a/rules/json-dbus-bridge.make b/rules/json-dbus-bridge.make
index 4eb7e6573..1cecf1fd4 100644
--- a/rules/json-dbus-bridge.make
+++ b/rules/json-dbus-bridge.make
@@ -24,7 +24,7 @@ JSON_DBUS_BRIDGE_SUFFIX := tar.bz2
JSON_DBUS_BRIDGE_URL := http://www.pengutronix.de/software/json-dbus-bridge/download/$(JSON_DBUS_BRIDGE).$(JSON_DBUS_BRIDGE_SUFFIX)
JSON_DBUS_BRIDGE_SOURCE := $(SRCDIR)/$(JSON_DBUS_BRIDGE).$(JSON_DBUS_BRIDGE_SUFFIX)
JSON_DBUS_BRIDGE_DIR := $(BUILDDIR)/$(JSON_DBUS_BRIDGE)
-JSON_DBUS_BRIDGE_LICENSE := LGPL-2.1+
+JSON_DBUS_BRIDGE_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/json-glib.make b/rules/json-glib.make
index 592c096e2..307d13001 100644
--- a/rules/json-glib.make
+++ b/rules/json-glib.make
@@ -23,7 +23,7 @@ JSON_GLIB_SUFFIX := tar.xz
JSON_GLIB_URL := http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.2/$(JSON_GLIB).$(JSON_GLIB_SUFFIX)
JSON_GLIB_SOURCE := $(SRCDIR)/$(JSON_GLIB).$(JSON_GLIB_SUFFIX)
JSON_GLIB_DIR := $(BUILDDIR)/$(JSON_GLIB)
-JSON_GLIB_LICENSE := LGPL-2.1
+JSON_GLIB_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/kbd.make b/rules/kbd.make
index c74c209b0..56f8af098 100644
--- a/rules/kbd.make
+++ b/rules/kbd.make
@@ -23,7 +23,7 @@ KBD_SUFFIX := tar.gz
KBD_URL := $(call ptx/mirror, KERNEL, utils/kbd/$(KBD).$(KBD_SUFFIX))
KBD_SOURCE := $(SRCDIR)/$(KBD).$(KBD_SUFFIX)
KBD_DIR := $(BUILDDIR)/$(KBD)
-KBD_LICENSE := GPL-2.0+
+KBD_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/kernel-header.make b/rules/kernel-header.make
index befee126f..1a9327990 100644
--- a/rules/kernel-header.make
+++ b/rules/kernel-header.make
@@ -23,7 +23,7 @@ KERNEL_HEADER_URL := $(call kernel-url, KERNEL_HEADER)
KERNEL_HEADER_SOURCE := $(SRCDIR)/linux-$(KERNEL_HEADER_VERSION).$(KERNEL_HEADER_SUFFIX)
KERNEL_HEADER_DIR := $(BUILDDIR)/kernel-header-$(KERNEL_HEADER_VERSION)
KERNEL_HEADER_PKGDIR := $(PKGDIR)/kernel-header-$(KERNEL_HEADER_VERSION)
-KERNEL_HEADER_LICENSE := GPL-2.0
+KERNEL_HEADER_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/kernel.make b/rules/kernel.make
index 87d242743..8d254970f 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -46,7 +46,7 @@ KERNEL_SUFFIX := tar.gz
endif
KERNEL_DIR := $(KERNEL_BDIR)/$(KERNEL)
KERNEL_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_KERNEL_CONFIG))
-KERNEL_LICENSE := GPL-2.0
+KERNEL_LICENSE := GPL-2.0-only
ifneq ($(KERNEL_NEEDS_GIT_URL),y)
KERNEL_URL := $(call kernel-url, KERNEL)
else
diff --git a/rules/keyutils.make b/rules/keyutils.make
index cb171e311..b3747596c 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+ AND LGPL-2.1+
+KEYUTILS_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/killproc.make b/rules/killproc.make
index 3813d8f1a..3d87d2bb3 100644
--- a/rules/killproc.make
+++ b/rules/killproc.make
@@ -24,7 +24,7 @@ KILLPROC_SUFFIX := tar.gz
KILLPROC_URL := http://ftp.suse.com/pub/projects/init/$(KILLPROC).$(KILLPROC_SUFFIX)
KILLPROC_SOURCE := $(SRCDIR)/$(KILLPROC).$(KILLPROC_SUFFIX)
KILLPROC_DIR := $(BUILDDIR)/$(KILLPROC)
-KILLPROC_LICENSE := GPL-2.0
+KILLPROC_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/lame.make b/rules/lame.make
index 646864db2..31ef593f8 100644
--- a/rules/lame.make
+++ b/rules/lame.make
@@ -23,7 +23,7 @@ LAME_SUFFIX := tar.gz
LAME_URL := $(call ptx/mirror, SF, lame/$(LAME).$(LAME_SUFFIX))
LAME_SOURCE := $(SRCDIR)/$(LAME).$(LAME_SUFFIX)
LAME_DIR := $(BUILDDIR)/$(LAME)
-LAME_LICENSE := LGPL-2.0
+LAME_LICENSE := LGPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/latencytop.make b/rules/latencytop.make
index 377584cc4..bd50e48fc 100644
--- a/rules/latencytop.make
+++ b/rules/latencytop.make
@@ -23,7 +23,7 @@ LATENCYTOP_SUFFIX := tar.gz
LATENCYTOP_URL := https://www.latencytop.org/download/$(LATENCYTOP).$(LATENCYTOP_SUFFIX);no-check-certificate
LATENCYTOP_SOURCE := $(SRCDIR)/$(LATENCYTOP).$(LATENCYTOP_SUFFIX)
LATENCYTOP_DIR := $(BUILDDIR)/$(LATENCYTOP)
-LATENCYTOP_LICENSE := GPL-2.0
+LATENCYTOP_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/latrace.make b/rules/latrace.make
index 96051cfd5..9a8bd5aac 100644
--- a/rules/latrace.make
+++ b/rules/latrace.make
@@ -23,7 +23,7 @@ LATRACE_SUFFIX := tar.bz2
LATRACE_URL := http://people.redhat.com/jolsa/latrace/dl/$(LATRACE).$(LATRACE_SUFFIX)
LATRACE_SOURCE := $(SRCDIR)/$(LATRACE).$(LATRACE_SUFFIX)
LATRACE_DIR := $(BUILDDIR)/$(LATRACE)
-LATRACE_LICENSE := GPL-3.0
+LATRACE_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ldd.make b/rules/ldd.make
index 1da9866cd..01b98bad3 100644
--- a/rules/ldd.make
+++ b/rules/ldd.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_LDD) += ldd
# This is the version from the glibc we have stolen from
LDD_VERSION := 2.7
-LDD_LICENSE := LGPL-2.1+
+LDD_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/less.make b/rules/less.make
index ff9fbd179..1a4ff3e0f 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+ AND BSD-2-Clause
+LESS_LICENSE := GPL-3.0-or-later AND BSD-2-Clause
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libaio.make b/rules/libaio.make
index 206ae4be2..8f108f299 100644
--- a/rules/libaio.make
+++ b/rules/libaio.make
@@ -23,7 +23,7 @@ LIBAIO_SUFFIX := tar.gz
LIBAIO_URL := http://pkgs.fedoraproject.org/repo/pkgs/libaio/libaio-0.3.110.tar.gz/2a35602e43778383e2f4907a4ca39ab8/$(LIBAIO).$(LIBAIO_SUFFIX)
LIBAIO_SOURCE := $(SRCDIR)/$(LIBAIO).$(LIBAIO_SUFFIX)
LIBAIO_DIR := $(BUILDDIR)/$(LIBAIO)
-LIBAIO_LICENSE := LGPL-2.1
+LIBAIO_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare + Compile
diff --git a/rules/libao.make b/rules/libao.make
index b98bfcb30..727fc1148 100644
--- a/rules/libao.make
+++ b/rules/libao.make
@@ -23,7 +23,7 @@ LIBAO_SUFFIX := tar.gz
LIBAO_URL := http://downloads.xiph.org/releases/ao/$(LIBAO).$(LIBAO_SUFFIX)
LIBAO_SOURCE := $(SRCDIR)/$(LIBAO).$(LIBAO_SUFFIX)
LIBAO_DIR := $(BUILDDIR)/$(LIBAO)
-LIBAO_LICENSE := GPL-2.0
+LIBAO_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libassuan.make b/rules/libassuan.make
index 3747ff982..66be70436 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 AND LGPL-2.1
+LIBASSUAN_LICENSE := GPL-3.0-only AND LGPL-2.1-only
LIBASSUAN_LICENSE_FILES := \
file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make
index d570a7c32..1f6f07416 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+ AND GPL-2.0+
+LIBCAP_NG_LICENSE := LGPL-2.1-or-later AND GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libcap.make b/rules/libcap.make
index 519156ad0..048794e3d 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 AND GPL-2.0
+LIBCAP_LICENSE := BSD-3-Clause AND GPL-2.0-only
LIBCAP_LICENSE_FILES := file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1
# ----------------------------------------------------------------------------
diff --git a/rules/libcgi.make b/rules/libcgi.make
index 5326a8016..163d88c1c 100644
--- a/rules/libcgi.make
+++ b/rules/libcgi.make
@@ -24,7 +24,7 @@ LIBCGI_SUFFIX := tar.gz
LIBCGI_URL := $(call ptx/mirror, SF, libcgi/$(LIBCGI).$(LIBCGI_SUFFIX))
LIBCGI_SOURCE := $(SRCDIR)/$(LIBCGI).$(LIBCGI_SUFFIX)
LIBCGI_DIR := $(BUILDDIR)/$(LIBCGI)
-LIBCGI_LICENSE := LGPL-2.1
+LIBCGI_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libcgroup.make b/rules/libcgroup.make
index a0df4113a..db73e47e7 100644
--- a/rules/libcgroup.make
+++ b/rules/libcgroup.make
@@ -23,7 +23,7 @@ LIBCGROUP_SUFFIX := tar.bz2
LIBCGROUP_URL := $(call ptx/mirror, SF, libcg/$(LIBCGROUP).$(LIBCGROUP_SUFFIX))
LIBCGROUP_SOURCE := $(SRCDIR)/$(LIBCGROUP).$(LIBCGROUP_SUFFIX)
LIBCGROUP_DIR := $(BUILDDIR)/$(LIBCGROUP)
-LIBCGROUP_LICENSE := LGPL-2.1
+LIBCGROUP_LICENSE := LGPL-2.1-only
#
# autoconf
diff --git a/rules/libcoap.make b/rules/libcoap.make
index eaee08fcb..7e6022d3c 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 AND GPL-2.0
+LIBCOAP_LICENSE := BSD AND GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libconfig.make b/rules/libconfig.make
index c4e77c3a4..241c0d8d0 100644
--- a/rules/libconfig.make
+++ b/rules/libconfig.make
@@ -23,7 +23,7 @@ LIBCONFIG_SUFFIX := tar.gz
LIBCONFIG_URL := http://www.hyperrealm.com/libconfig/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
LIBCONFIG_SOURCE := $(SRCDIR)/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
LIBCONFIG_DIR := $(BUILDDIR)/$(LIBCONFIG)
-LIBCONFIG_LICENSE := LGPL-2.1
+LIBCONFIG_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libdaemon.make b/rules/libdaemon.make
index 0bb64388b..36d7f98c2 100644
--- a/rules/libdaemon.make
+++ b/rules/libdaemon.make
@@ -24,7 +24,7 @@ LIBDAEMON_SUFFIX := tar.gz
LIBDAEMON_URL := http://0pointer.de/lennart/projects/libdaemon/$(LIBDAEMON).$(LIBDAEMON_SUFFIX)
LIBDAEMON_SOURCE := $(SRCDIR)/$(LIBDAEMON).$(LIBDAEMON_SUFFIX)
LIBDAEMON_DIR := $(BUILDDIR)/$(LIBDAEMON)
-LIBDAEMON_LICENSE := LGPL-2.1+
+LIBDAEMON_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libelf.make b/rules/libelf.make
index 2427aa527..4846563e0 100644
--- a/rules/libelf.make
+++ b/rules/libelf.make
@@ -24,7 +24,7 @@ LIBELF_SUFFIX := tar.bz2
LIBELF_URL := https://sourceware.org/elfutils/ftp/$(LIBELF_VERSION)/$(LIBELF).$(LIBELF_SUFFIX)
LIBELF_SOURCE := $(SRCDIR)/$(LIBELF).$(LIBELF_SUFFIX)
LIBELF_DIR := $(BUILDDIR)/$(LIBELF)
-LIBELF_LICENSE := (LGPL-3.0+ OR GPL-2.0+) AND GPL-3.0+
+LIBELF_LICENSE := (LGPL-3.0-or-later OR GPL-2.0-or-later) AND GPL-3.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libestr.make b/rules/libestr.make
index eb1712f0e..1b53508f1 100644
--- a/rules/libestr.make
+++ b/rules/libestr.make
@@ -23,7 +23,7 @@ LIBESTR_SUFFIX := tar.gz
LIBESTR_URL := http://libestr.adiscon.com/files/download/$(LIBESTR).$(LIBESTR_SUFFIX)
LIBESTR_SOURCE := $(SRCDIR)/$(LIBESTR).$(LIBESTR_SUFFIX)
LIBESTR_DIR := $(BUILDDIR)/$(LIBESTR)
-LIBESTR_LICENSE := LGPL-2.1+
+LIBESTR_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libexif.make b/rules/libexif.make
index 490dda524..93942f369 100644
--- a/rules/libexif.make
+++ b/rules/libexif.make
@@ -23,7 +23,7 @@ LIBEXIF_SUFFIX := tar.bz2
LIBEXIF_URL := http://sourceforge.net/projects/libexif/files/libexif/$(LIBEXIF_VERSION)/$(LIBEXIF).$(LIBEXIF_SUFFIX)
LIBEXIF_SOURCE := $(SRCDIR)/$(LIBEXIF).$(LIBEXIF_SUFFIX)
LIBEXIF_DIR := $(BUILDDIR)/$(LIBEXIF)
-LIBEXIF_LICENSE := LGPL-2.0+
+LIBEXIF_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libfaketime.make b/rules/libfaketime.make
index 373690477..fe5d21b46 100644
--- a/rules/libfaketime.make
+++ b/rules/libfaketime.make
@@ -17,7 +17,7 @@ LIBFAKETIME_SUFFIX := tar.gz
LIBFAKETIME_URL := https://github.com/wolfcw/libfaketime/archive/v$(LIBFAKETIME_VERSION).$(LIBFAKETIME_SUFFIX)
LIBFAKETIME_SOURCE := $(SRCDIR)/$(LIBFAKETIME).$(LIBFAKETIME_SUFFIX)
LIBFAKETIME_DIR := $(BUILDDIR)/$(LIBFAKETIME)
-LIBFAKETIME_LICENSE := GPL-2.0
+LIBFAKETIME_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libftdi.make b/rules/libftdi.make
index 115baa550..f3588cbf6 100644
--- a/rules/libftdi.make
+++ b/rules/libftdi.make
@@ -24,7 +24,7 @@ LIBFTDI_SUFFIX := tar.gz
LIBFTDI_URL := http://www.intra2net.com/en/developer/libftdi/download/$(LIBFTDI).$(LIBFTDI_SUFFIX)
LIBFTDI_SOURCE := $(SRCDIR)/$(LIBFTDI).$(LIBFTDI_SUFFIX)
LIBFTDI_DIR := $(BUILDDIR)/$(LIBFTDI)
-LIBFTDI_LICENSE := LGPL-2.1
+LIBFTDI_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libftdi1.make b/rules/libftdi1.make
index d062a3865..dc715d00c 100644
--- a/rules/libftdi1.make
+++ b/rules/libftdi1.make
@@ -23,7 +23,7 @@ LIBFTDI1_SUFFIX := tar.bz2
LIBFTDI1_URL := http://www.intra2net.com/en/developer/libftdi/download/$(LIBFTDI1).$(LIBFTDI1_SUFFIX)
LIBFTDI1_SOURCE := $(SRCDIR)/$(LIBFTDI1).$(LIBFTDI1_SUFFIX)
LIBFTDI1_DIR := $(BUILDDIR)/$(LIBFTDI1)
-LIBFTDI1_LICENSE := LGPL-2.1
+LIBFTDI1_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
index 66a04012e..2f3f8c1b5 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 AND LGPL-2.0
+LIBGCRYPT_LICENSE := GPL-2.0-only AND LGPL-2.0-only
LIBGCRYPT_LICENSE_FILES := \
file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff
diff --git a/rules/libgee.make b/rules/libgee.make
index 93b9d4593..0db123a8c 100644
--- a/rules/libgee.make
+++ b/rules/libgee.make
@@ -23,7 +23,7 @@ LIBGEE_SUFFIX := tar.bz2
LIBGEE_URL := http://download.gnome.org/sources/libgee/0.5/$(LIBGEE).$(LIBGEE_SUFFIX)
LIBGEE_SOURCE := $(SRCDIR)/$(LIBGEE).$(LIBGEE_SUFFIX)
LIBGEE_DIR := $(BUILDDIR)/$(LIBGEE)
-LIBGEE_LICENSE := LGPL-2.1+
+LIBGEE_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libgmp.make b/rules/libgmp.make
index 51a91f810..1c9568f37 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 AND LGPL-3.0
+LIBGMP_LICENSE := GPL-3.0-only AND LGPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 4ad170c38..96de745e6 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 AND LGPL-2.0
+LIBGPG_ERROR_LICENSE := GPL-2.0-only AND LGPL-2.0-only
LIBGPG_ERROR_LICENSE_FILES := \
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
diff --git a/rules/libgpiod.make b/rules/libgpiod.make
index 5bbc384ed..edac55bfa 100644
--- a/rules/libgpiod.make
+++ b/rules/libgpiod.make
@@ -23,7 +23,7 @@ LIBGPIOD_SUFFIX := tar.gz
LIBGPIOD_URL := https://www.kernel.org/pub/software/libs/libgpiod/$(LIBGPIOD).$(LIBGPIOD_SUFFIX)
LIBGPIOD_SOURCE := $(SRCDIR)/$(LIBGPIOD).$(LIBGPIOD_SUFFIX)
LIBGPIOD_DIR := $(BUILDDIR)/$(LIBGPIOD)
-LIBGPIOD_LICENSE := LGPL-2.1
+LIBGPIOD_LICENSE := LGPL-2.1-only
LIBGPIOD_LICENSE_FILES := file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de
# ----------------------------------------------------------------------------
diff --git a/rules/libgudev.make b/rules/libgudev.make
index 922e6e8f0..19c1595fd 100644
--- a/rules/libgudev.make
+++ b/rules/libgudev.make
@@ -23,7 +23,7 @@ LIBGUDEV_SUFFIX := tar.xz
LIBGUDEV_URL := https://download.gnome.org/sources/libgudev/$(LIBGUDEV_VERSION)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX)
LIBGUDEV_SOURCE := $(SRCDIR)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX)
LIBGUDEV_DIR := $(BUILDDIR)/$(LIBGUDEV)
-LIBGUDEV_LICENSE := LGPL-2.1+
+LIBGUDEV_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libiodbc.make b/rules/libiodbc.make
index 31d0ca909..e053495cd 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 AND BSD
+LIBIODBC_LICENSE := LGPL-2.0-only AND BSD
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libkmod.make b/rules/libkmod.make
index adf5904d4..9251b6b4b 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 AND LGPL-2.0
+LIBKMOD_LICENSE := GPL-2.0-only AND LGPL-2.0-only
LIBKMOD_LICENSE_FILES := \
file://tools/COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343
diff --git a/rules/libksba.make b/rules/libksba.make
index c9501a9df..fbdba47ee 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 AND GPL-3.0 AND LGPL-3.0
+LIBKSBA_LICENSE := GPL-2.0-only AND GPL-3.0-only AND LGPL-3.0-only
LIBKSBA_LICENSE_FILES := \
file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \
diff --git a/rules/liblockfile.make b/rules/liblockfile.make
index c5861ac87..546ad33ea 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+ AND LGPL-2.0+
+LIBLOCKFILE_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later
LIBLOCKFILE_LICENSE_FILES := file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868b6
# ----------------------------------------------------------------------------
diff --git a/rules/libltdl.make b/rules/libltdl.make
index 5c116557c..31b22ceb2 100644
--- a/rules/libltdl.make
+++ b/rules/libltdl.make
@@ -24,7 +24,7 @@ LIBLTDL_URL := $(call ptx/mirror, GNU, libtool/$(LIBLTDL).$(LIBLTDL_SUFFIX))
LIBLTDL_SOURCE := $(SRCDIR)/$(LIBLTDL).$(LIBLTDL_SUFFIX)
LIBLTDL_DIR := $(BUILDDIR)/$(LIBLTDL)
# License for libltdl only
-LIBLTDL_LICENSE := LGPL-2.0+
+LIBLTDL_LICENSE := LGPL-2.0-or-later
LIBLTDL_LICENSE_FILES := \
file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c
diff --git a/rules/liblzo.make b/rules/liblzo.make
index b94c0063d..25393adee 100644
--- a/rules/liblzo.make
+++ b/rules/liblzo.make
@@ -24,7 +24,7 @@ LIBLZO_SUFFIX := tar.gz
LIBLZO_URL := http://www.oberhumer.com/opensource/lzo/download/$(LIBLZO).$(LIBLZO_SUFFIX)
LIBLZO_SOURCE := $(SRCDIR)/$(LIBLZO).$(LIBLZO_SUFFIX)
LIBLZO_DIR := $(BUILDDIR)/$(LIBLZO)
-LIBLZO_LICENSE := GPL-2.0+
+LIBLZO_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmad.make b/rules/libmad.make
index 7f5c9323b..1d1b3c667 100644
--- a/rules/libmad.make
+++ b/rules/libmad.make
@@ -23,7 +23,7 @@ LIBMAD_SUFFIX := tar.gz
LIBMAD_URL := ftp://ftp.mars.org/pub/mpeg/$(LIBMAD).$(LIBMAD_SUFFIX)
LIBMAD_SOURCE := $(SRCDIR)/$(LIBMAD).$(LIBMAD_SUFFIX)
LIBMAD_DIR := $(BUILDDIR)/$(LIBMAD)
-LIBMAD_LICENSE := GPL-2.0+
+LIBMAD_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmbim.make b/rules/libmbim.make
index 1fc8a8f9c..228be568a 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+ AND LGPL-2.1+
+LIBMBIM_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
index 483501e8c..8776e429b 100644
--- a/rules/libmicrohttpd.make
+++ b/rules/libmicrohttpd.make
@@ -24,7 +24,7 @@ LIBMICROHTTPD_SUFFIX := tar.gz
LIBMICROHTTPD_URL := $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
LIBMICROHTTPD_SOURCE := $(SRCDIR)/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)
LIBMICROHTTPD_DIR := $(BUILDDIR)/$(LIBMICROHTTPD)
-LIBMICROHTTPD_LICENSE := LGPL-2.1 OR GPL-2.0 WITH eCos-exception-2.0
+LIBMICROHTTPD_LICENSE := LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmikmod.make b/rules/libmikmod.make
index 53c389d28..fbd11ad56 100644
--- a/rules/libmikmod.make
+++ b/rules/libmikmod.make
@@ -23,7 +23,7 @@ LIBMIKMOD_SUFFIX := tar.gz
LIBMIKMOD_URL := $(call ptx/mirror, SF, mikmod/$(LIBMIKMOD).$(LIBMIKMOD_SUFFIX))
LIBMIKMOD_SOURCE := $(SRCDIR)/$(LIBMIKMOD).$(LIBMIKMOD_SUFFIX)
LIBMIKMOD_DIR := $(BUILDDIR)/$(LIBMIKMOD)
-LIBMIKMOD_LICENSE := LGPL-2.0+
+LIBMIKMOD_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmms.make b/rules/libmms.make
index 7733a942e..aa49dcd49 100644
--- a/rules/libmms.make
+++ b/rules/libmms.make
@@ -23,7 +23,7 @@ LIBMMS_SUFFIX := tar.gz
LIBMMS_URL := $(call ptx/mirror, SF, libmms/libmms-$(LIBMMS_VERSION).$(LIBMMS_SUFFIX))
LIBMMS_SOURCE := $(SRCDIR)/$(LIBMMS).$(LIBMMS_SUFFIX)
LIBMMS_DIR := $(BUILDDIR)/$(LIBMMS)
-LIBMMS_LICENSE := LGPL-2.1+
+LIBMMS_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmnl.make b/rules/libmnl.make
index f07bf4e3b..cacef7d07 100644
--- a/rules/libmnl.make
+++ b/rules/libmnl.make
@@ -23,7 +23,7 @@ LIBMNL_SUFFIX := tar.bz2
LIBMNL_URL := http://ftp.netfilter.org/pub/libmnl/$(LIBMNL).$(LIBMNL_SUFFIX)
LIBMNL_SOURCE := $(SRCDIR)/$(LIBMNL).$(LIBMNL_SUFFIX)
LIBMNL_DIR := $(BUILDDIR)/$(LIBMNL)
-LIBMNL_LICENSE := GPL-2.0
+LIBMNL_LICENSE := GPL-2.0-only
#
# autoconf
diff --git a/rules/libmodbus.make b/rules/libmodbus.make
index 86c6416b1..ace733ed8 100644
--- a/rules/libmodbus.make
+++ b/rules/libmodbus.make
@@ -23,7 +23,7 @@ LIBMODBUS_SUFFIX := tar.gz
LIBMODBUS_URL := http://github.com/downloads/stephane/libmodbus/$(LIBMODBUS).$(LIBMODBUS_SUFFIX)
LIBMODBUS_SOURCE := $(SRCDIR)/$(LIBMODBUS).$(LIBMODBUS_SUFFIX)
LIBMODBUS_DIR := $(BUILDDIR)/$(LIBMODBUS)
-LIBMODBUS_LICENSE := LGPL-3.0
+LIBMODBUS_LICENSE := LGPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
index 69d175d1b..9f9acdc6d 100644
--- a/rules/libmodbus3.make
+++ b/rules/libmodbus3.make
@@ -23,7 +23,7 @@ LIBMODBUS3_SUFFIX := tar.gz
LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
-LIBMODBUS3_LICENSE := LGPL-3.0
+LIBMODBUS3_LICENSE := LGPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmpeg2.make b/rules/libmpeg2.make
index 4a277e209..89b7f712a 100644
--- a/rules/libmpeg2.make
+++ b/rules/libmpeg2.make
@@ -23,7 +23,7 @@ LIBMPEG2_SUFFIX := tar.gz
LIBMPEG2_URL := http://libmpeg2.sourceforge.net/files//$(LIBMPEG2).$(LIBMPEG2_SUFFIX)
LIBMPEG2_SOURCE := $(SRCDIR)/$(LIBMPEG2).$(LIBMPEG2_SUFFIX)
LIBMPEG2_DIR := $(BUILDDIR)/$(LIBMPEG2)
-LIBMPEG2_LICENSE := GPL-2.0
+LIBMPEG2_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libmxml.make b/rules/libmxml.make
index 04ea1807a..69337c49f 100644
--- a/rules/libmxml.make
+++ b/rules/libmxml.make
@@ -21,7 +21,7 @@ LIBMXML_SUFFIX := tar.gz
LIBMXML_URL := https://github.com/michaelrsweet/mxml/releases/download/v$(LIBMXML_VERSION)/$(LIBMXML).$(LIBMXML_SUFFIX)
LIBMXML_SOURCE := $(SRCDIR)/$(LIBMXML).$(LIBMXML_SUFFIX)
LIBMXML_DIR := $(BUILDDIR)/mxml-$(LIBMXML_VERSION)
-LIBMXML_LICENSE := LGPL-2.0
+LIBMXML_LICENSE := LGPL-2.0-only
LIBMXML_STRIP_LEVEL := 0
# ----------------------------------------------------------------------------
diff --git a/rules/libndp.make b/rules/libndp.make
index 90b5308f5..5e90c9edf 100644
--- a/rules/libndp.make
+++ b/rules/libndp.make
@@ -23,7 +23,7 @@ LIBNDP_SUFFIX := tar.gz
LIBNDP_URL := http://libndp.org/files/$(LIBNDP).$(LIBNDP_SUFFIX)
LIBNDP_SOURCE := $(SRCDIR)/$(LIBNDP).$(LIBNDP_SUFFIX)
LIBNDP_DIR := $(BUILDDIR)/$(LIBNDP)
-LIBNDP_LICENSE := LGPL-2.1
+LIBNDP_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libnetfilter_conntrack.make b/rules/libnetfilter_conntrack.make
index 5288f97b7..83b7027c5 100644
--- a/rules/libnetfilter_conntrack.make
+++ b/rules/libnetfilter_conntrack.make
@@ -23,7 +23,7 @@ LIBNETFILTER_CONNTRACK_SUFFIX := tar.bz2
LIBNETFILTER_CONNTRACK_URL := http://ftp.netfilter.org/pub/libnetfilter_conntrack/$(LIBNETFILTER_CONNTRACK).$(LIBNETFILTER_CONNTRACK_SUFFIX)
LIBNETFILTER_CONNTRACK_SOURCE := $(SRCDIR)/$(LIBNETFILTER_CONNTRACK).$(LIBNETFILTER_CONNTRACK_SUFFIX)
LIBNETFILTER_CONNTRACK_DIR := $(BUILDDIR)/$(LIBNETFILTER_CONNTRACK)
-LIBNETFILTER_CONNTRACK_LICENSE := GPL-2.0
+LIBNETFILTER_CONNTRACK_LICENSE := GPL-2.0-only
#
# autoconf
diff --git a/rules/libnetfilter_queue.make b/rules/libnetfilter_queue.make
index b30a9fcbf..309b58a64 100644
--- a/rules/libnetfilter_queue.make
+++ b/rules/libnetfilter_queue.make
@@ -23,7 +23,7 @@ LIBNETFILTER_QUEUE_SUFFIX := tar.bz2
LIBNETFILTER_QUEUE_URL := http://ftp.netfilter.org/pub/libnetfilter_queue/$(LIBNETFILTER_QUEUE).$(LIBNETFILTER_QUEUE_SUFFIX)
LIBNETFILTER_QUEUE_SOURCE := $(SRCDIR)/$(LIBNETFILTER_QUEUE).$(LIBNETFILTER_QUEUE_SUFFIX)
LIBNETFILTER_QUEUE_DIR := $(BUILDDIR)/$(LIBNETFILTER_QUEUE)
-LIBNETFILTER_QUEUE_LICENSE := GPL-2.0
+LIBNETFILTER_QUEUE_LICENSE := GPL-2.0-only
#
# autoconf
diff --git a/rules/libnewt.make b/rules/libnewt.make
index fddec7397..51e14c319 100644
--- a/rules/libnewt.make
+++ b/rules/libnewt.make
@@ -23,7 +23,7 @@ LIBNEWT_SUFFIX := tar.gz
LIBNEWT_URL := https://releases.pagure.org/newt/$(LIBNEWT).$(LIBNEWT_SUFFIX)
LIBNEWT_SOURCE := $(SRCDIR)/$(LIBNEWT).$(LIBNEWT_SUFFIX)
LIBNEWT_DIR := $(BUILDDIR)/$(LIBNEWT)
-LIBNEWT_LICENSE := GPL-2.0
+LIBNEWT_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libnftnl.make b/rules/libnftnl.make
index 744412ac1..7d73a2194 100644
--- a/rules/libnftnl.make
+++ b/rules/libnftnl.make
@@ -23,7 +23,7 @@ LIBNFTNL_SUFFIX := tar.bz2
LIBNFTNL_URL := http://ftp.netfilter.org/pub/libnftnl/$(LIBNFTNL).$(LIBNFTNL_SUFFIX)
LIBNFTNL_SOURCE := $(SRCDIR)/$(LIBNFTNL).$(LIBNFTNL_SUFFIX)
LIBNFTNL_DIR := $(BUILDDIR)/$(LIBNFTNL)
-LIBNFTNL_LICENSE := GPL-2.0
+LIBNFTNL_LICENSE := GPL-2.0-only
#
# autoconf
diff --git a/rules/libnih.make b/rules/libnih.make
index 8391c37ce..9633a34d7 100644
--- a/rules/libnih.make
+++ b/rules/libnih.make
@@ -23,7 +23,7 @@ LIBNIH_SUFFIX := tar.gz
LIBNIH_URL := http://launchpad.net/libnih/1.0/$(LIBNIH_VERSION)/+download/$(LIBNIH).$(LIBNIH_SUFFIX)
LIBNIH_DIR := $(BUILDDIR)/$(LIBNIH)
LIBNIH_SOURCE := $(SRCDIR)/$(LIBNIH).$(LIBNIH_SUFFIX)
-LIBNIH_LICENSE := GPL-2.0+
+LIBNIH_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libnl.make b/rules/libnl.make
index 9f15c70bb..e87c115c3 100644
--- a/rules/libnl.make
+++ b/rules/libnl.make
@@ -24,7 +24,7 @@ LIBNL_SUFFIX := tar.gz
LIBNL_URL := http://people.suug.ch/~tgr/libnl/files/$(LIBNL).$(LIBNL_SUFFIX)
LIBNL_SOURCE := $(SRCDIR)/$(LIBNL).$(LIBNL_SUFFIX)
LIBNL_DIR := $(BUILDDIR)/$(LIBNL)
-LIBNL_LICENSE := LGPL-2.1
+LIBNL_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libnl3.make b/rules/libnl3.make
index a9805552a..e3bda8785 100644
--- a/rules/libnl3.make
+++ b/rules/libnl3.make
@@ -24,7 +24,7 @@ LIBNL3_SUFFIX := tar.gz
LIBNL3_URL := https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX)
LIBNL3_SOURCE := $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX)
LIBNL3_DIR := $(BUILDDIR)/$(LIBNL3)
-LIBNL3_LICENSE := GPL-2.0
+LIBNL3_LICENSE := GPL-2.0-only
#
# autoconf
diff --git a/rules/liboping.make b/rules/liboping.make
index 9f38b53b5..07829faed 100644
--- a/rules/liboping.make
+++ b/rules/liboping.make
@@ -23,7 +23,7 @@ LIBOPING_SUFFIX := tar.gz
LIBOPING_URL := http://verplant.org/liboping/files/$(LIBOPING).$(LIBOPING_SUFFIX)
LIBOPING_SOURCE := $(SRCDIR)/$(LIBOPING).$(LIBOPING_SUFFIX)
LIBOPING_DIR := $(BUILDDIR)/$(LIBOPING)
-LIBOPING_LICENSE := LGPL-2.1+
+LIBOPING_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libpaper.make b/rules/libpaper.make
index 6a8128b8e..239118165 100644
--- a/rules/libpaper.make
+++ b/rules/libpaper.make
@@ -26,7 +26,7 @@ LIBPAPER_SUFFIX := tar.gz
LIBPAPER_URL := http://snapshot.debian.org/archive/debian-debug/20161113T151229Z/pool/main/libp/libpaper/libpaper_$(LIBPAPER_VERSION).$(LIBPAPER_SUFFIX)
LIBPAPER_SOURCE := $(SRCDIR)/$(LIBPAPER).$(LIBPAPER_SUFFIX)
LIBPAPER_DIR := $(BUILDDIR)/$(LIBPAPER)
-LIBPAPER_LICENSE := GPL-2.0
+LIBPAPER_LICENSE := GPL-2.0-only
LIBPAPER_LICENSE_FILES := file://COPYING;md5=0278281246c1e59af1ef0ae1784a4948
# ----------------------------------------------------------------------------
diff --git a/rules/libpipeline.make b/rules/libpipeline.make
index 444d346c8..77b0ebafc 100644
--- a/rules/libpipeline.make
+++ b/rules/libpipeline.make
@@ -23,7 +23,7 @@ LIBPIPELINE_SUFFIX := tar.gz
LIBPIPELINE_URL := http://download.savannah.gnu.org/releases/libpipeline/$(LIBPIPELINE).$(LIBPIPELINE_SUFFIX)
LIBPIPELINE_SOURCE := $(SRCDIR)/$(LIBPIPELINE).$(LIBPIPELINE_SUFFIX)
LIBPIPELINE_DIR := $(BUILDDIR)/$(LIBPIPELINE)
-LIBPIPELINE_LICENSE := GPL-3.0
+LIBPIPELINE_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libqmi.make b/rules/libqmi.make
index b32206091..8817e4837 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+ AND LGPL-2.1+
+LIBQMI_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libqxt.make b/rules/libqxt.make
index 719728236..f21f359eb 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 AND CPLv1.0
+LIBQXT_LICENSE := LGPL-2.1-only AND CPLv1.0
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libseccomp.make b/rules/libseccomp.make
index 1fe86c3c5..1f67d4072 100644
--- a/rules/libseccomp.make
+++ b/rules/libseccomp.make
@@ -23,7 +23,7 @@ LIBSECCOMP_SUFFIX := tar.gz
LIBSECCOMP_URL := https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION)/$(LIBSECCOMP).$(LIBSECCOMP_SUFFIX)
LIBSECCOMP_SOURCE := $(SRCDIR)/$(LIBSECCOMP).$(LIBSECCOMP_SUFFIX)
LIBSECCOMP_DIR := $(BUILDDIR)/$(LIBSECCOMP)
-LIBSECCOMP_LICENSE := LGPL-2.1
+LIBSECCOMP_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libsemanage.make b/rules/libsemanage.make
index 073b91ab4..76cdf6f6a 100644
--- a/rules/libsemanage.make
+++ b/rules/libsemanage.make
@@ -23,7 +23,7 @@ LIBSEMANAGE_SUFFIX := tar.gz
LIBSEMANAGE_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(LIBSEMANAGE).$(LIBSEMANAGE_SUFFIX)
LIBSEMANAGE_SOURCE := $(SRCDIR)/$(LIBSEMANAGE).$(LIBSEMANAGE_SUFFIX)
LIBSEMANAGE_DIR := $(BUILDDIR)/$(LIBSEMANAGE)
-LIBSEMANAGE_LICENSE := LGPL-2.1+
+LIBSEMANAGE_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libsepol.make b/rules/libsepol.make
index b00b094de..d8e3f3d62 100644
--- a/rules/libsepol.make
+++ b/rules/libsepol.make
@@ -23,7 +23,7 @@ LIBSEPOL_SUFFIX := tar.gz
LIBSEPOL_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(LIBSEPOL).$(LIBSEPOL_SUFFIX)
LIBSEPOL_SOURCE := $(SRCDIR)/$(LIBSEPOL).$(LIBSEPOL_SUFFIX)
LIBSEPOL_DIR := $(BUILDDIR)/$(LIBSEPOL)
-LIBSEPOL_LICENSE := LGPL-2.1+
+LIBSEPOL_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libshout.make b/rules/libshout.make
index 788596845..7040bc231 100644
--- a/rules/libshout.make
+++ b/rules/libshout.make
@@ -23,7 +23,7 @@ LIBSHOUT_SUFFIX := tar.gz
LIBSHOUT_URL := http://downloads.xiph.org/releases/libshout/$(LIBSHOUT).$(LIBSHOUT_SUFFIX)
LIBSHOUT_SOURCE := $(SRCDIR)/$(LIBSHOUT).$(LIBSHOUT_SUFFIX)
LIBSHOUT_DIR := $(BUILDDIR)/$(LIBSHOUT)
-LIBSHOUT_LICENSE := LGPL-2.0+
+LIBSHOUT_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libsndfile.make b/rules/libsndfile.make
index 7dd4492e3..26c537868 100644
--- a/rules/libsndfile.make
+++ b/rules/libsndfile.make
@@ -23,7 +23,7 @@ LIBSNDFILE_SUFFIX := tar.gz
LIBSNDFILE_URL := http://www.mega-nerd.com/libsndfile/files/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX)
LIBSNDFILE_SOURCE := $(SRCDIR)/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX)
LIBSNDFILE_DIR := $(BUILDDIR)/$(LIBSNDFILE)
-LIBSNDFILE_LICENSE := LGPL-2.1
+LIBSNDFILE_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libsocketcan.make b/rules/libsocketcan.make
index dfd839a48..127942044 100644
--- a/rules/libsocketcan.make
+++ b/rules/libsocketcan.make
@@ -23,7 +23,7 @@ LIBSOCKETCAN_SUFFIX := tar.bz2
LIBSOCKETCAN_URL := http://www.pengutronix.de/software/libsocketcan/download/$(LIBSOCKETCAN).$(LIBSOCKETCAN_SUFFIX)
LIBSOCKETCAN_SOURCE := $(SRCDIR)/$(LIBSOCKETCAN).$(LIBSOCKETCAN_SUFFIX)
LIBSOCKETCAN_DIR := $(BUILDDIR)/$(LIBSOCKETCAN)
-LIBSOCKETCAN_LICENSE := LGPL-2.1+
+LIBSOCKETCAN_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libsoup.make b/rules/libsoup.make
index f56171d99..11240daea 100644
--- a/rules/libsoup.make
+++ b/rules/libsoup.make
@@ -23,7 +23,7 @@ LIBSOUP_SUFFIX := tar.xz
LIBSOUP_URL := http://ftp.gnome.org/pub/GNOME/sources/libsoup/$(basename $(LIBSOUP_VERSION))/$(LIBSOUP).$(LIBSOUP_SUFFIX)
LIBSOUP_SOURCE := $(SRCDIR)/$(LIBSOUP).$(LIBSOUP_SUFFIX)
LIBSOUP_DIR := $(BUILDDIR)/$(LIBSOUP)
-LIBSOUP_LICENSE := LGPL-2.1
+LIBSOUP_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libsysfs.make b/rules/libsysfs.make
index dc5cbd598..5a0adcd7c 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 AND LGPL-2.0
+LIBSYSFS_LICENSE := GPL-2.0-only AND LGPL-2.0-only
LIBSYSFS_LICENSE_FILES := \
file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \
file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e
diff --git a/rules/libtasn1.make b/rules/libtasn1.make
index 39de1bafd..a4a382aa9 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 AND GPL-3.0
+LIBTASN1_LICENSE := LGPL-2.1-only AND GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/liburcu.make b/rules/liburcu.make
index 6d9b237b5..b72a68712 100644
--- a/rules/liburcu.make
+++ b/rules/liburcu.make
@@ -23,7 +23,7 @@ LIBURCU_SUFFIX := tar.bz2
LIBURCU_URL := http://lttng.org/files/urcu/$(LIBURCU).$(LIBURCU_SUFFIX)
LIBURCU_SOURCE := $(SRCDIR)/$(LIBURCU).$(LIBURCU_SUFFIX)
LIBURCU_DIR := $(BUILDDIR)/$(LIBURCU)
-LIBURCU_LICENSE := LGPL-2.1
+LIBURCU_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libusb-compat.make b/rules/libusb-compat.make
index d32568158..ada55bb88 100644
--- a/rules/libusb-compat.make
+++ b/rules/libusb-compat.make
@@ -23,7 +23,7 @@ LIBUSB_COMPAT_SUFFIX := tar.bz2
LIBUSB_COMPAT_URL := $(call ptx/mirror, SF, libusb/$(LIBUSB_COMPAT).$(LIBUSB_COMPAT_SUFFIX))
LIBUSB_COMPAT_SOURCE := $(SRCDIR)/$(LIBUSB_COMPAT).$(LIBUSB_COMPAT_SUFFIX)
LIBUSB_COMPAT_DIR := $(BUILDDIR)/$(LIBUSB_COMPAT)
-LIBUSB_COMPAT_LICENSE := LGPL-2.1
+LIBUSB_COMPAT_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/libusb.make b/rules/libusb.make
index c82cc137b..909b0a468 100644
--- a/rules/libusb.make
+++ b/rules/libusb.make
@@ -23,7 +23,7 @@ LIBUSB_SUFFIX := tar.bz2
LIBUSB_URL := $(call ptx/mirror, SF, libusb/$(LIBUSB).$(LIBUSB_SUFFIX))
LIBUSB_SOURCE := $(SRCDIR)/$(LIBUSB).$(LIBUSB_SUFFIX)
LIBUSB_DIR := $(BUILDDIR)/$(LIBUSB)
-LIBUSB_LICENSE := LGPL-2.1
+LIBUSB_LICENSE := LGPL-2.1-only
#
# autoconf
diff --git a/rules/libzmq.make b/rules/libzmq.make
index 5a1dcf691..51a0c59ce 100644
--- a/rules/libzmq.make
+++ b/rules/libzmq.make
@@ -23,7 +23,7 @@ LIBZMQ_SUFFIX := tar.gz
LIBZMQ_URL := http://download.zeromq.org/$(LIBZMQ).$(LIBZMQ_SUFFIX)
LIBZMQ_SOURCE := $(SRCDIR)/$(LIBZMQ).$(LIBZMQ_SUFFIX)
LIBZMQ_DIR := $(BUILDDIR)/$(LIBZMQ)
-LIBZMQ_LICENSE := LGPL-3.0+
+LIBZMQ_LICENSE := LGPL-3.0-or-later
#
# autoconf
diff --git a/rules/linuxptp.make b/rules/linuxptp.make
index d74be4250..2acb30c38 100644
--- a/rules/linuxptp.make
+++ b/rules/linuxptp.make
@@ -24,7 +24,7 @@ LINUXPTP_SUFFIX := tgz
LINUXPTP_URL := $(call ptx/mirror, SF, linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX))
LINUXPTP_SOURCE := $(SRCDIR)/$(LINUXPTP).$(LINUXPTP_SUFFIX)
LINUXPTP_DIR := $(BUILDDIR)/$(LINUXPTP)
-LINUXPTP_LICENSE := GPL-2.0+
+LINUXPTP_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/lm_sensors.make b/rules/lm_sensors.make
index b9ddaa689..5bede75da 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+ AND LGPL-2.1+
+LM_SENSORS_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/lmbench.make b/rules/lmbench.make
index 19adee777..d78ec8d33 100644
--- a/rules/lmbench.make
+++ b/rules/lmbench.make
@@ -23,7 +23,7 @@ LMBENCH_SUFFIX := tgz
LMBENCH_URL := $(call ptx/mirror, SF, lmbench/$(LMBENCH).$(LMBENCH_SUFFIX))
LMBENCH_SOURCE := $(SRCDIR)/$(LMBENCH).$(LMBENCH_SUFFIX)
LMBENCH_DIR := $(BUILDDIR)/$(LMBENCH)
-LMBENCH_LICENSE := GPL-2.0 with exceptions
+LMBENCH_LICENSE := GPL-2.0-only with exceptions
LMBENCH_LICENSE_FILES := \
file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
file://COPYING-2;md5=8e9aee2ccc75d61d107e43794a25cdf9
diff --git a/rules/logrotate.make b/rules/logrotate.make
index b92242185..828c33cf3 100644
--- a/rules/logrotate.make
+++ b/rules/logrotate.make
@@ -24,7 +24,7 @@ LOGROTATE_SUFFIX := tar.gz
LOGROTATE_URL := http://downloads.yoctoproject.org/mirror/sources/$(LOGROTATE).$(LOGROTATE_SUFFIX)
LOGROTATE_SOURCE := $(SRCDIR)/$(LOGROTATE).$(LOGROTATE_SUFFIX)
LOGROTATE_DIR := $(BUILDDIR)/$(LOGROTATE)
-LOGROTATE_LICENSE := GPL-2.0
+LOGROTATE_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Compile
diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make
index 33ca1269e..d1ab68dd6 100644
--- a/rules/lpc21isp.make
+++ b/rules/lpc21isp.make
@@ -24,7 +24,7 @@ LPC21ISP_SUFFIX := tar.gz
LPC21ISP_URL := $(call ptx/mirror, SF, lpc21isp/$(LPC21ISP_VERSION)/$(LPC21ISP).$(LPC21ISP_SUFFIX))
LPC21ISP_SOURCE := $(SRCDIR)/$(LPC21ISP).$(LPC21ISP_SUFFIX)
LPC21ISP_DIR := $(BUILDDIR)/$(LPC21ISP)
-LPC21ISP_LICENSE := GPL-3.0+
+LPC21ISP_LICENSE := GPL-3.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/lshw.make b/rules/lshw.make
index 72bbb276a..693bbc3e8 100644
--- a/rules/lshw.make
+++ b/rules/lshw.make
@@ -23,7 +23,7 @@ LSHW_SUFFIX := tar.gz
LSHW_URL := http://www.ezix.org/software/files/$(LSHW).$(LSHW_SUFFIX)
LSHW_SOURCE := $(SRCDIR)/$(LSHW).$(LSHW_SUFFIX)
LSHW_DIR := $(BUILDDIR)/$(LSHW)
-LSHW_LICENSE := GPL-2.0
+LSHW_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/lvm2.make b/rules/lvm2.make
index 26d5c6474..960417bd5 100644
--- a/rules/lvm2.make
+++ b/rules/lvm2.make
@@ -25,7 +25,7 @@ LVM2_URL := \
ftp://sources.redhat.com/pub/lvm2/old/$(LVM2).$(LVM2_SUFFIX)
LVM2_SOURCE := $(SRCDIR)/$(LVM2).$(LVM2_SUFFIX)
LVM2_DIR := $(BUILDDIR)/$(LVM2)
-LVM2_LICENSE := GPL-2.0, LGPL-2.1
+LVM2_LICENSE := GPL-2.0-only, LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/lz4.make b/rules/lz4.make
index 109251a11..8fbcd76f8 100644
--- a/rules/lz4.make
+++ b/rules/lz4.make
@@ -23,7 +23,7 @@ LZ4_SUFFIX := tar.gz
LZ4_URL := https://github.com/Cyan4973/lz4/archive/v$(LZ4_VERSION).$(LZ4_SUFFIX)
LZ4_SOURCE := $(SRCDIR)/$(LZ4).$(LZ4_SUFFIX)
LZ4_DIR := $(BUILDDIR)/$(LZ4)
-LZ4_LICENSE := BSD-2-Clause AND GPL-2.0+
+LZ4_LICENSE := BSD-2-Clause AND GPL-2.0-or-later
LZ4_LICENSE_FILES := \
file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \
file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \
diff --git a/rules/mariadb.make b/rules/mariadb.make
index b8fa7a747..5322c3eeb 100644
--- a/rules/mariadb.make
+++ b/rules/mariadb.make
@@ -23,7 +23,7 @@ MARIADB_SUFFIX := tar.gz
MARIADB_URL := https://downloads.mariadb.com/MariaDB/$(MARIADB)/source/$(MARIADB).$(MARIADB_SUFFIX)
MARIADB_SOURCE := $(SRCDIR)/$(MARIADB).$(MARIADB_SUFFIX)
MARIADB_DIR := $(BUILDDIR)/$(MARIADB)
-MARIADB_LICENSE := GPL-2.0
+MARIADB_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/mc.make b/rules/mc.make
index 6db156862..2586c2c3d 100644
--- a/rules/mc.make
+++ b/rules/mc.make
@@ -24,7 +24,7 @@ MC_SUFFIX := tar.gz
MC_URL := http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/$(MC).$(MC_SUFFIX)
MC_SOURCE := $(SRCDIR)/$(MC).$(MC_SUFFIX)
MC_DIR := $(BUILDDIR)/$(MC)
-MC_LICENSE := GPL-2.0
+MC_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
diff --git a/rules/memedit.make b/rules/memedit.make
index 378c97c7c..3a9ea7878 100644
--- a/rules/memedit.make
+++ b/rules/memedit.make
@@ -19,7 +19,7 @@ PACKAGES-$(PTXCONF_MEMEDIT) += memedit
#
MEMEDIT_VERSION := 0.9
MEMEDIT_MD5 := fd8eb827c3072baf8678d9d33e5d6458
-MEMEDIT_LICENSE := GPL-2.0
+MEMEDIT_LICENSE := GPL-2.0-only
MEMEDIT := memedit-$(MEMEDIT_VERSION)
MEMEDIT_SUFFIX := tar.gz
MEMEDIT_URL := http://www.pengutronix.de/software/memedit/downloads/$(MEMEDIT).$(MEMEDIT_SUFFIX)
diff --git a/rules/memtest.make b/rules/memtest.make
index 14e3b15ee..a30aa019f 100644
--- a/rules/memtest.make
+++ b/rules/memtest.make
@@ -23,7 +23,7 @@ MEMTEST_SUFFIX := tar.bz2
MEMTEST_URL := http://www.madsgroup.org/~quintela/memtest/$(MEMTEST).$(MEMTEST_SUFFIX)
MEMTEST_SOURCE := $(SRCDIR)/$(MEMTEST).$(MEMTEST_SUFFIX)
MEMTEST_DIR := $(BUILDDIR)/$(MEMTEST)
-MEMTEST_LICENSE := GPL-2.0
+MEMTEST_LICENSE := GPL-2.0-only
MEMTEST_LICENSE_FILES := file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
# ----------------------------------------------------------------------------
diff --git a/rules/memtester.make b/rules/memtester.make
index 4f4997b1a..916f1fde9 100644
--- a/rules/memtester.make
+++ b/rules/memtester.make
@@ -24,7 +24,7 @@ MEMTESTER_SUFFIX := tar.gz
MEMTESTER_URL := http://pyropus.ca/software/memtester/old-versions/$(MEMTESTER).$(MEMTESTER_SUFFIX)
MEMTESTER_SOURCE := $(SRCDIR)/$(MEMTESTER).$(MEMTESTER_SUFFIX)
MEMTESTER_DIR := $(BUILDDIR)/$(MEMTESTER)
-MEMTESTER_LICENSE := GPL-2.0
+MEMTESTER_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/memtool.make b/rules/memtool.make
index 7766a3baa..dcfe26269 100644
--- a/rules/memtool.make
+++ b/rules/memtool.make
@@ -23,7 +23,7 @@ MEMTOOL_SUFFIX := tar.xz
MEMTOOL_URL := http://www.pengutronix.de/software/memtool/downloads/$(MEMTOOL).$(MEMTOOL_SUFFIX)
MEMTOOL_SOURCE := $(SRCDIR)/$(MEMTOOL).$(MEMTOOL_SUFFIX)
MEMTOOL_DIR := $(BUILDDIR)/$(MEMTOOL)
-MEMTOOL_LICENSE := GPL-2.0
+MEMTOOL_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/microcom.make b/rules/microcom.make
index 2227ea9ff..51faa6624 100644
--- a/rules/microcom.make
+++ b/rules/microcom.make
@@ -23,7 +23,7 @@ MICROCOM_SUFFIX := tar.gz
MICROCOM_URL := http://www.pengutronix.de/software/microcom/download/$(MICROCOM).$(MICROCOM_SUFFIX)
MICROCOM_SOURCE := $(SRCDIR)/$(MICROCOM).$(MICROCOM_SUFFIX)
MICROCOM_DIR := $(BUILDDIR)/$(MICROCOM)
-MICROCOM_LICENSE := GPL-2.0
+MICROCOM_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/minicom.make b/rules/minicom.make
index 837848abb..077268917 100644
--- a/rules/minicom.make
+++ b/rules/minicom.make
@@ -24,7 +24,7 @@ MINICOM_SUFFIX := tar.gz
MINICOM_URL := https://alioth.debian.org/frs/download.php/file/3869/$(MINICOM).$(MINICOM_SUFFIX)
MINICOM_SOURCE := $(SRCDIR)/$(MINICOM).$(MINICOM_SUFFIX)
MINICOM_DIR := $(BUILDDIR)/$(MINICOM)
-MINICOM_LICENSE := GPL-2.0
+MINICOM_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make
index 444ff410d..3a3317bcb 100644
--- a/rules/mmc-utils.make
+++ b/rules/mmc-utils.make
@@ -24,7 +24,7 @@ MMC_UTILS_SUFFIX := tar.gz
MMC_UTILS_URL := git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;tag=$(MMC_UTILS_VERSION)
MMC_UTILS_SOURCE := $(SRCDIR)/$(MMC_UTILS).$(MMC_UTILS_SUFFIX)
MMC_UTILS_DIR := $(BUILDDIR)/$(MMC_UTILS)
-MMC_UTILS_LICENSE := GPL-2.0 AND BSD-3-Clause
+MMC_UTILS_LICENSE := GPL-2.0-only AND BSD-3-Clause
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index 0d55e7232..af839f2c6 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+ AND GPL-3.0+ AND LGPL-2.1+
+MODEMMANAGER_LICENSE := GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make
index 6d9cc5753..aa1d5d443 100644
--- a/rules/module-init-tools.make
+++ b/rules/module-init-tools.make
@@ -24,7 +24,7 @@ MODULE_INIT_TOOLS_SUFFIX := tar.bz2
MODULE_INIT_TOOLS_URL := $(call ptx/mirror, KERNEL, utils/kernel/module-init-tools/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX))
MODULE_INIT_TOOLS_SOURCE := $(SRCDIR)/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX)
MODULE_INIT_TOOLS_DIR := $(BUILDDIR)/$(MODULE_INIT_TOOLS)
-MODULE_INIT_TOOLS_LICENSE := GPL-2.0
+MODULE_INIT_TOOLS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/monit.make b/rules/monit.make
index 3d7f880d9..2870e8056 100644
--- a/rules/monit.make
+++ b/rules/monit.make
@@ -23,7 +23,7 @@ MONIT_SUFFIX := tar.gz
MONIT_URL := http://mmonit.com/monit/dist/$(MONIT).$(MONIT_SUFFIX)
MONIT_SOURCE := $(SRCDIR)/$(MONIT).$(MONIT_SUFFIX)
MONIT_DIR := $(BUILDDIR)/$(MONIT)
-MONIT_LICENSE := AGPL-3.0
+MONIT_LICENSE := AGPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/mosh.make b/rules/mosh.make
index fe4b027f9..1a012800f 100644
--- a/rules/mosh.make
+++ b/rules/mosh.make
@@ -23,7 +23,7 @@ MOSH_SUFFIX := tar.gz
MOSH_URL := https://mosh.mit.edu/$(MOSH).$(MOSH_SUFFIX)
MOSH_SOURCE := $(SRCDIR)/$(MOSH).$(MOSH_SUFFIX)
MOSH_DIR := $(BUILDDIR)/$(MOSH)
-MOSH_LICENSE := GPL-3.0
+MOSH_LICENSE := GPL-3.0-only
#
# autoconf
diff --git a/rules/mpg123.make b/rules/mpg123.make
index 391acdcbd..63c08a834 100644
--- a/rules/mpg123.make
+++ b/rules/mpg123.make
@@ -23,7 +23,7 @@ MPG123_SUFFIX := tar.bz2
MPG123_URL := http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX)
MPG123_SOURCE := $(SRCDIR)/$(MPG123).$(MPG123_SUFFIX)
MPG123_DIR := $(BUILDDIR)/$(MPG123)
-MPG123_LICENSE := LGPL-2.1
+MPG123_LICENSE := LGPL-2.1-only
MPG123_LICENSE_FILES := \
file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3
diff --git a/rules/msmtp.make b/rules/msmtp.make
index e3d59e09a..3c5ab0ddc 100644
--- a/rules/msmtp.make
+++ b/rules/msmtp.make
@@ -23,7 +23,7 @@ MSMTP_SUFFIX := tar.bz2
MSMTP_URL := $(call ptx/mirror, SF, msmtp/$(MSMTP).$(MSMTP_SUFFIX))
MSMTP_SOURCE := $(SRCDIR)/$(MSMTP).$(MSMTP_SUFFIX)
MSMTP_DIR := $(BUILDDIR)/$(MSMTP)
-MSMTP_LICENSE := GPL-3.0
+MSMTP_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index 76d8a91c9..68c9caf86 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -24,7 +24,7 @@ MTD_UTILS_SUFFIX := tar.bz2
MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX)
MTD_UTILS_SOURCE := $(SRCDIR)/$(MTD_UTILS).$(MTD_UTILS_SUFFIX)
MTD_UTILS_DIR := $(BUILDDIR)/$(MTD_UTILS)
-MTD_UTILS_LICENSE := GPL-2.0+
+MTD_UTILS_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/mtr.make b/rules/mtr.make
index 9dad3a971..5859495d0 100644
--- a/rules/mtr.make
+++ b/rules/mtr.make
@@ -23,7 +23,7 @@ MTR_SUFFIX := tar.gz
MTR_URL := ftp://ftp.bitwizard.nl/mtr/$(MTR).$(MTR_SUFFIX)
MTR_SOURCE := $(SRCDIR)/$(MTR).$(MTR_SUFFIX)
MTR_DIR := $(BUILDDIR)/$(MTR)
-MTR_LICENSE := GPL-2.0+
+MTR_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/munin.make b/rules/munin.make
index ab3d2bc7f..e362ffae5 100644
--- a/rules/munin.make
+++ b/rules/munin.make
@@ -23,7 +23,7 @@ MUNIN_SUFFIX := tar.gz
MUNIN_URL := $(call ptx/mirror, SF, munin/$(MUNIN).$(MUNIN_SUFFIX))
MUNIN_SOURCE := $(SRCDIR)/$(MUNIN).$(MUNIN_SUFFIX)
MUNIN_DIR := $(BUILDDIR)/$(MUNIN)
-MUNIN_LICENSE := GPL-2.0
+MUNIN_LICENSE := GPL-2.0-only
MUNIN_MAKE_PAR := NO
# ----------------------------------------------------------------------------
diff --git a/rules/mysql.make b/rules/mysql.make
index 47df42c44..5912a1520 100644
--- a/rules/mysql.make
+++ b/rules/mysql.make
@@ -25,7 +25,7 @@ MYSQL_SUFFIX := tar.gz
MYSQL_URL := https://dev.mysql.com/get/Downloads/MySQL-5.7/$(MYSQL).tar.gz
MYSQL_SOURCE := $(SRCDIR)/$(MYSQL).$(MYSQL_SUFFIX)
MYSQL_DIR := $(BUILDDIR)/$(MYSQL)
-MYSQL_LICENSE := GPL-2.0
+MYSQL_LICENSE := GPL-2.0-only
# mySQL has a hard dependency to boost_1_59_0. Deal with it
diff --git a/rules/nano.make b/rules/nano.make
index 78e305fc0..95e54017a 100644
--- a/rules/nano.make
+++ b/rules/nano.make
@@ -24,7 +24,7 @@ NANO_SUFFIX := tar.gz
NANO_URL := https://www.nano-editor.org/dist/v$(basename $(NANO_VERSION))/$(NANO).$(NANO_SUFFIX)
NANO_SOURCE := $(SRCDIR)/$(NANO).$(NANO_SUFFIX)
NANO_DIR := $(BUILDDIR)/$(NANO)
-NANO_LICENSE := GPL-3.0+
+NANO_LICENSE := GPL-3.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/nbd.make b/rules/nbd.make
index 846fdeb1e..2e02d6708 100644
--- a/rules/nbd.make
+++ b/rules/nbd.make
@@ -23,7 +23,7 @@ NBD_SUFFIX := tar.xz
NBD_URL := $(call ptx/mirror, SF, nbd/$(NBD).$(NBD_SUFFIX))
NBD_SOURCE := $(SRCDIR)/$(NBD).$(NBD_SUFFIX)
NBD_DIR := $(BUILDDIR)/$(NBD)
-NBD_LICENSE := GPL-2.0
+NBD_LICENSE := GPL-2.0-only
#
# autoconf
diff --git a/rules/nettle.make b/rules/nettle.make
index 59df66e15..87bdcd2ab 100644
--- a/rules/nettle.make
+++ b/rules/nettle.make
@@ -22,7 +22,7 @@ NETTLE := nettle-$(NETTLE_VERSION)
NETTLE_SUFFIX := tar.gz
NETTLE_SOURCE := $(SRCDIR)/$(NETTLE).$(NETTLE_SUFFIX)
NETTLE_DIR := $(BUILDDIR)/$(NETTLE)
-NETTLE_LICENSE := GPL-2.0+
+NETTLE_LICENSE := GPL-2.0-or-later
NETTLE_MAKE_PAR := NO
NETTLE_URL := \
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 75503f463..057ccf1af 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -24,7 +24,7 @@ NETWORKMANAGER_SUFFIX := tar.xz
NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.10/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
-NETWORKMANAGER_LICENSE := GPL-2.0+ AND LGPL-2.0+
+NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later
NETWORKMANAGER_LICENSE_FILES := file://COPYING;md5=cbbffd568227ada506640fe950a4823b
# ----------------------------------------------------------------------------
diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index 28d6461bf..929f53c72 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -23,7 +23,7 @@ NFSUTILS_SUFFIX := tar.bz2
NFSUTILS_URL := $(call ptx/mirror, SF, nfs/$(NFSUTILS).$(NFSUTILS_SUFFIX))
NFSUTILS_SOURCE := $(SRCDIR)/$(NFSUTILS).$(NFSUTILS_SUFFIX)
NFSUTILS_DIR := $(BUILDDIR)/$(NFSUTILS)
-NFSUTILS_LICENSE := GPL-2.0+
+NFSUTILS_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/nftables.make b/rules/nftables.make
index 7486c7303..02c2cedd5 100644
--- a/rules/nftables.make
+++ b/rules/nftables.make
@@ -23,7 +23,7 @@ NFTABLES_SUFFIX := tar.bz2
NFTABLES_URL := http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SUFFIX)
NFTABLES_SOURCE := $(SRCDIR)/$(NFTABLES).$(NFTABLES_SUFFIX)
NFTABLES_DIR := $(BUILDDIR)/$(NFTABLES)
-NFTABLES_LICENSE := GPL-2.0
+NFTABLES_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/npth.make b/rules/npth.make
index 6dda1e361..b65519f79 100644
--- a/rules/npth.make
+++ b/rules/npth.make
@@ -23,7 +23,7 @@ NPTH_SUFFIX := tar.bz2
NPTH_URL := ftp://ftp.gnupg.org/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX)
NPTH_SOURCE := $(SRCDIR)/$(NPTH).$(NPTH_SUFFIX)
NPTH_DIR := $(BUILDDIR)/$(NPTH)
-NPTH_LICENSE := LGPL-2.1
+NPTH_LICENSE := LGPL-2.1-only
NPTH_LICENSE_FILES := \
file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de
diff --git a/rules/nss-mdns.make b/rules/nss-mdns.make
index ac5cc5a2b..b8e21f671 100644
--- a/rules/nss-mdns.make
+++ b/rules/nss-mdns.make
@@ -23,7 +23,7 @@ NSS_MDNS_SUFFIX := tar.gz
NSS_MDNS_URL := http://0pointer.de/lennart/projects/nss-mdns/$(NSS_MDNS).$(NSS_MDNS_SUFFIX)
NSS_MDNS_SOURCE := $(SRCDIR)/$(NSS_MDNS).$(NSS_MDNS_SUFFIX)
NSS_MDNS_DIR := $(BUILDDIR)/$(NSS_MDNS)
-NSS_MDNS_LICENSE := LGPL-2.1+
+NSS_MDNS_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ntpclient.make b/rules/ntpclient.make
index 53a3c24e8..a106fed57 100644
--- a/rules/ntpclient.make
+++ b/rules/ntpclient.make
@@ -25,7 +25,7 @@ NTPCLIENT_TARBALL := ntpclient_2007_$(NTPCLIENT_VERSION).$(NTPCLIENT_SUFFIX)
NTPCLIENT_URL := http://doolittle.icarus.com/ntpclient/$(NTPCLIENT_TARBALL)
NTPCLIENT_SOURCE := $(SRCDIR)/$(NTPCLIENT_TARBALL)
NTPCLIENT_DIR := $(BUILDDIR)/$(NTPCLIENT)
-NTPCLIENT_LICENSE := GPL-2.0
+NTPCLIENT_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/openocd.make b/rules/openocd.make
index 86dd3fbcd..898f1a98c 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+ AND BSD
+OPENOCD_LICENSE := GPL-2.0-or-later AND BSD
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/opensc.make b/rules/opensc.make
index 2ad543b86..21465b19f 100644
--- a/rules/opensc.make
+++ b/rules/opensc.make
@@ -24,7 +24,7 @@ OPENSC_SUFFIX := tar.gz
OPENSC_URL := https://github.com/OpenSC/OpenSC/archive/$(OPENSC_VERSION).$(OPENSC_SUFFIX)
OPENSC_SOURCE := $(SRCDIR)/$(OPENSC).$(OPENSC_SUFFIX)
OPENSC_DIR := $(BUILDDIR)/$(OPENSC)
-OPENSC_LICENSE := LGPL-2.1+ AND Expat AND ISC
+OPENSC_LICENSE := LGPL-2.1-or-later AND Expat AND ISC
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/opkg.make b/rules/opkg.make
index d05c19655..b8dec1a77 100644
--- a/rules/opkg.make
+++ b/rules/opkg.make
@@ -24,7 +24,7 @@ OPKG_SUFFIX := tar.gz
OPKG_URL := http://downloads.yoctoproject.org/releases/opkg/$(OPKG).$(OPKG_SUFFIX)
OPKG_SOURCE := $(SRCDIR)/$(OPKG).$(OPKG_SUFFIX)
OPKG_DIR := $(BUILDDIR)/$(OPKG)
-OPKG_LICENSE := GPL-2.0+
+OPKG_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/owfs.make b/rules/owfs.make
index a220b7e94..dadd30ec6 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+ AND LGPL-2.0+
+OWFS_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/pango.make b/rules/pango.make
index 515a361e5..113e241c7 100644
--- a/rules/pango.make
+++ b/rules/pango.make
@@ -25,7 +25,7 @@ PANGO_SUFFIX := tar.bz2
PANGO_URL := http://ftp.gnome.org/pub/GNOME/sources/pango/1.29/$(PANGO).$(PANGO_SUFFIX)
PANGO_SOURCE := $(SRCDIR)/$(PANGO).$(PANGO_SUFFIX)
PANGO_DIR := $(BUILDDIR)/$(PANGO)
-PANGO_LICENSE := LGPL-2.0+
+PANGO_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/parted.make b/rules/parted.make
index 86eb0c9e1..acb1b3930 100644
--- a/rules/parted.make
+++ b/rules/parted.make
@@ -23,7 +23,7 @@ PARTED_SUFFIX := tar.gz
PARTED_URL := $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
PARTED_SOURCE := $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
PARTED_DIR := $(BUILDDIR)/$(PARTED)
-PARTED_LICENSE := GPL-3.0
+PARTED_LICENSE := GPL-3.0-only
#
# autoconf
diff --git a/rules/pciutils.make b/rules/pciutils.make
index 536a85fcd..75a0b6dbf 100644
--- a/rules/pciutils.make
+++ b/rules/pciutils.make
@@ -24,7 +24,7 @@ PCIUTILS_SUFFIX := tar.xz
PCIUTILS_URL := $(call ptx/mirror, KERNEL, ../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX))
PCIUTILS_SOURCE := $(SRCDIR)/$(PCIUTILS).$(PCIUTILS_SUFFIX)
PCIUTILS_DIR := $(BUILDDIR)/$(PCIUTILS)
-PCIUTILS_LICENSE := GPL-2.0
+PCIUTILS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/pcsc-lite.make b/rules/pcsc-lite.make
index 7e09674b7..e9d474606 100644
--- a/rules/pcsc-lite.make
+++ b/rules/pcsc-lite.make
@@ -25,7 +25,7 @@ PCSC_LITE_URL := https://alioth.debian.org/frs/download.php/file/4138/$(PCSC_LI
PCSC_LITE_SOURCE := $(SRCDIR)/$(PCSC_LITE).$(PCSC_LITE_SUFFIX)
PCSC_LITE_DIR := $(BUILDDIR)/$(PCSC_LITE)
PCSC_LITE_BUILD_OOT := YES
-# src/spy LICENSE := GPL-3.0+ - but file is not distributed
+# src/spy LICENSE := GPL-3.0-or-later - but file is not distributed
PCSC_LITE_LICENSE := BSD-3-Clause AND BSD-2-Clause AND MIT AND ISC
# ----------------------------------------------------------------------------
diff --git a/rules/perl.make b/rules/perl.make
index 311a4fc5a..f4c2590c1 100644
--- a/rules/perl.make
+++ b/rules/perl.make
@@ -23,7 +23,7 @@ PERL_SUFFIX := tar.gz
PERL_URL := http://cpan.perl.org/src/5.0/$(PERL).$(PERL_SUFFIX)
PERL_SOURCE := $(SRCDIR)/$(PERL).$(PERL_SUFFIX)
PERL_DIR := $(BUILDDIR)/$(PERL)
-PERL_LICENSE := GPL-1.0
+PERL_LICENSE := GPL-1.0-only
PERL_LICENSE_FILES := file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b
PERLCROSS_VERSION := 5.18.2-cross-0.8.5
diff --git a/rules/picocom.make b/rules/picocom.make
index 565e20438..30f56072b 100644
--- a/rules/picocom.make
+++ b/rules/picocom.make
@@ -23,7 +23,7 @@ PICOCOM_SUFFIX := tar.gz
PICOCOM_URL := https://github.com/npat-efault/picocom/archive/$(PICOCOM_VERSION).$(PICOCOM_SUFFIX)
PICOCOM_SOURCE := $(SRCDIR)/$(PICOCOM_VERSION).$(PICOCOM_SUFFIX)
PICOCOM_DIR := $(BUILDDIR)/$(PICOCOM)
-PICOCOM_LICENSE := GPL-2.0+
+PICOCOM_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/policycoreutils.make b/rules/policycoreutils.make
index 58ff2ae39..28942f19b 100644
--- a/rules/policycoreutils.make
+++ b/rules/policycoreutils.make
@@ -23,7 +23,7 @@ POLICYCOREUTILS_SUFFIX := tar.gz
POLICYCOREUTILS_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(POLICYCOREUTILS).$(POLICYCOREUTILS_SUFFIX)
POLICYCOREUTILS_SOURCE := $(SRCDIR)/$(POLICYCOREUTILS).$(POLICYCOREUTILS_SUFFIX)
POLICYCOREUTILS_DIR := $(BUILDDIR)/$(POLICYCOREUTILS)
-POLICYCOREUTILS_LICENSE := GPL-2.0+
+POLICYCOREUTILS_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/poppler-data.make b/rules/poppler-data.make
index 1272cb65f..956747847 100644
--- a/rules/poppler-data.make
+++ b/rules/poppler-data.make
@@ -23,7 +23,7 @@ POPPLER_DATA_SUFFIX := tar.gz
POPPLER_DATA_URL := https://poppler.freedesktop.org/$(POPPLER_DATA).$(POPPLER_DATA_SUFFIX)
POPPLER_DATA_SOURCE := $(SRCDIR)/$(POPPLER_DATA).$(POPPLER_DATA_SUFFIX)
POPPLER_DATA_DIR := $(BUILDDIR)/$(POPPLER_DATA)
-POPPLER_DATA_LICENSE := GPL-2.0 AND MIT AND BSD-3-Clause
+POPPLER_DATA_LICENSE := GPL-2.0-only AND MIT AND BSD-3-Clause
POPPLER_DATA_LICENSE_FILES := \
file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \
file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \
diff --git a/rules/poppler.make b/rules/poppler.make
index cb28e9914..229d85fe2 100644
--- a/rules/poppler.make
+++ b/rules/poppler.make
@@ -29,7 +29,7 @@ POPPLER_SUFFIX := tar.xz
POPPLER_URL := http://poppler.freedesktop.org/$(POPPLER).$(POPPLER_SUFFIX)
POPPLER_SOURCE := $(SRCDIR)/$(POPPLER).$(POPPLER_SUFFIX)
POPPLER_DIR := $(BUILDDIR)/$(POPPLER)
-POPPLER_LICENSE := GPL-2.0 OR GPL-3.0
+POPPLER_LICENSE := GPL-2.0-only OR GPL-3.0-only
POPPLER_LICENSE_FILES := \
file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYING3;md5=d32239bcb673463ab874e80d47fae504
diff --git a/rules/powertop.make b/rules/powertop.make
index 7a8223c21..0953f354f 100644
--- a/rules/powertop.make
+++ b/rules/powertop.make
@@ -24,7 +24,7 @@ POWERTOP_SUFFIX := tar.gz
POWERTOP_URL := https://01.org/sites/default/files/downloads/powertop/$(POWERTOP).$(POWERTOP_SUFFIX)
POWERTOP_SOURCE := $(SRCDIR)/$(POWERTOP).$(POWERTOP_SUFFIX)
POWERTOP_DIR := $(BUILDDIR)/$(POWERTOP)
-POWERTOP_LICENSE := GPL-2.0
+POWERTOP_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ppp.make b/rules/ppp.make
index 5ed8ad6df..a1e11f6b0 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 AND GPL-2.0
+PPP_LICENSE := BSD AND GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/prelink.make b/rules/prelink.make
index f6dfb443a..a3a40b124 100644
--- a/rules/prelink.make
+++ b/rules/prelink.make
@@ -24,7 +24,7 @@ PRELINK_TARBALL := prelink_$(PRELINK_VERSION).$(PRELINK_SUFFIX)
PRELINK_URL := $(call ptx/mirror, DEB, pool/main/p/prelink/$(PRELINK_TARBALL))
PRELINK_SOURCE := $(SRCDIR)/$(PRELINK_TARBALL)
PRELINK_DIR := $(BUILDDIR)/$(PRELINK)
-PRELINK_LICENSE := GPL-2.0
+PRELINK_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/procps.make b/rules/procps.make
index 4821b74dd..f8e96d6f9 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -26,7 +26,7 @@ PROCPS_SUFFIX := tar.xz
PROCPS_URL := $(call ptx/mirror, SF, procps-ng/Production/$(PROCPS).$(PROCPS_SUFFIX))
PROCPS_SOURCE := $(SRCDIR)/$(PROCPS).$(PROCPS_SUFFIX)
PROCPS_DIR := $(BUILDDIR)/$(PROCPS)
-PROCPS_LICENSE := GPL-2.0 AND LGPL-2.0
+PROCPS_LICENSE := GPL-2.0-only AND LGPL-2.0-only
PROCPS_LICENSE_FILES := \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db
diff --git a/rules/ps3-utils.make b/rules/ps3-utils.make
index 89e18038e..5e48473eb 100644
--- a/rules/ps3-utils.make
+++ b/rules/ps3-utils.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_PS3_UTILS) += ps3-utils
#
PS3_UTILS_VERSION := 2.3
PS3_UTILS_MD5 := 40ec16f4a7612c67c0ef5ea1828d1c7f
-PS3_UTILS_LICENSE := GPL-2.0
+PS3_UTILS_LICENSE := GPL-2.0-only
PS3_UTILS := ps3-utils-$(PS3_UTILS_VERSION)
PS3_UTILS_SUFFIX := tar.gz
PS3_UTILS_URL := $(call ptx/mirror, KERNEL, kernel/people/geoff/cell/ps3-utils/$(PS3_UTILS).$(PS3_UTILS_SUFFIX))
diff --git a/rules/pslib.make b/rules/pslib.make
index 13d7269ee..62aca73fc 100644
--- a/rules/pslib.make
+++ b/rules/pslib.make
@@ -23,7 +23,7 @@ PSLIB_SUFFIX := tar.gz
PSLIB_URL := $(call ptx/mirror, SF, pslib/$(PSLIB).$(PSLIB_SUFFIX))
PSLIB_SOURCE := $(SRCDIR)/$(PSLIB).$(PSLIB_SUFFIX)
PSLIB_DIR := $(BUILDDIR)/$(PSLIB)
-PSLIB_LICENSE := LGPL-2.0+
+PSLIB_LICENSE := LGPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ptrtd.make b/rules/ptrtd.make
index dd38eaea3..08ef88013 100644
--- a/rules/ptrtd.make
+++ b/rules/ptrtd.make
@@ -30,7 +30,7 @@ PTRTD_SUFFIX := tar.gz
PTRTD_URL := https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ptrtd/ptrtd_$(PTRTD_VERSION)$(PTRTD_VERSION_SUFFIX).$(PTRTD_SUFFIX)
PTRTD_SOURCE := $(SRCDIR)/ptrtd_$(PTRTD_VERSION)$(PTRTD_VERSION_SUFFIX).$(PTRTD_SUFFIX)
PTRTD_DIR := $(BUILDDIR)/$(PTRTD)
-PTRTD_LICENSE := GPL-2.0
+PTRTD_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
index 4ecae2664..8dda3501a 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 AND GPL-2.0+ AND LGPL-2.1+ AND Rdisc AND ADRIAN
+PULSEAUDIO_LICENSE := MIT AND GPL-2.0-or-later AND LGPL-2.1-or-later AND Rdisc AND ADRIAN
PULSEAUDIO_LICENSE_FILES := \
file://LICENSE;md5=d9ae089c8dc5339f8ac9d8563038a29f \
file://GPL;md5=4325afd396febcb659c36b49533135d4 \
diff --git a/rules/pygobject.make b/rules/pygobject.make
index ef61ff34d..3694820b0 100644
--- a/rules/pygobject.make
+++ b/rules/pygobject.make
@@ -23,7 +23,7 @@ PYGOBJECT_SUFFIX := tar.gz
PYGOBJECT_URL := http://ftp.gnome.org/pub/GNOME/sources/pygobject/$(basename $(PYGOBJECT_VERSION))/$(PYGOBJECT).$(PYGOBJECT_SUFFIX)
PYGOBJECT_SOURCE := $(SRCDIR)/$(PYGOBJECT).$(PYGOBJECT_SUFFIX)
PYGOBJECT_DIR := $(BUILDDIR)/$(PYGOBJECT)
-PYGOBJECT_LICENSE := LGPL-2.1+
+PYGOBJECT_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/python3-chardet.make b/rules/python3-chardet.make
index f73594383..5d7bc113e 100644
--- a/rules/python3-chardet.make
+++ b/rules/python3-chardet.make
@@ -23,7 +23,7 @@ PYTHON3_CHARDET_SUFFIX := tar.gz
PYTHON3_CHARDET_URL := https://pypi.python.org/packages/source/c/chardet/$(PYTHON3_CHARDET).$(PYTHON3_CHARDET_SUFFIX)
PYTHON3_CHARDET_SOURCE := $(SRCDIR)/$(PYTHON3_CHARDET).$(PYTHON3_CHARDET_SUFFIX)
PYTHON3_CHARDET_DIR := $(BUILDDIR)/$(PYTHON3_CHARDET)
-PYTHON3_CHARDET_LICENSE := LGPL-2.1+
+PYTHON3_CHARDET_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/python3-gi.make b/rules/python3-gi.make
index c3d94b193..dfa364faa 100644
--- a/rules/python3-gi.make
+++ b/rules/python3-gi.make
@@ -23,7 +23,7 @@ PYTHON3_GI_SUFFIX := tar.xz
PYTHON3_GI_URL := http://ftp.gnome.org/pub/GNOME/sources/pygobject/$(basename $(PYTHON3_GI_VERSION))/$(PYTHON3_GI).$(PYTHON3_GI_SUFFIX)
PYTHON3_GI_SOURCE := $(SRCDIR)/$(PYTHON3_GI).$(PYTHON3_GI_SUFFIX)
PYTHON3_GI_DIR := $(BUILDDIR)/$(PYTHON3_GI)
-PYTHON3_GI_LICENSE := LGPL-2.1+
+PYTHON3_GI_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/python3-pyside.make b/rules/python3-pyside.make
index 6435a2304..ddb1d4f30 100644
--- a/rules/python3-pyside.make
+++ b/rules/python3-pyside.make
@@ -23,7 +23,7 @@ PYTHON3_PYSIDE_SUFFIX := tar.bz2
PYTHON3_PYSIDE_URL := http://download.qt-project.org/official_releases/pyside/$(PYTHON3_PYSIDE).$(PYTHON3_PYSIDE_SUFFIX)
PYTHON3_PYSIDE_SOURCE := $(SRCDIR)/$(PYTHON3_PYSIDE).$(PYTHON3_PYSIDE_SUFFIX)
PYTHON3_PYSIDE_DIR := $(BUILDDIR)/$(PYTHON3_PYSIDE)
-PYTHON3_PYSIDE_LICENSE := LGPL-2.1
+PYTHON3_PYSIDE_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/python3-shiboken.make b/rules/python3-shiboken.make
index ffbbdfba8..871b18b39 100644
--- a/rules/python3-shiboken.make
+++ b/rules/python3-shiboken.make
@@ -23,7 +23,7 @@ PYTHON3_SHIBOKEN_SUFFIX := tar.bz2
PYTHON3_SHIBOKEN_URL := https://download.qt.io/official_releases/pyside/shiboken-$(PYTHON3_SHIBOKEN_VERSION).$(PYTHON3_SHIBOKEN_SUFFIX)
PYTHON3_SHIBOKEN_SOURCE := $(SRCDIR)/$(PYTHON3_SHIBOKEN).$(PYTHON3_SHIBOKEN_SUFFIX)
PYTHON3_SHIBOKEN_DIR := $(BUILDDIR)/$(PYTHON3_SHIBOKEN)
-PYTHON3_SHIBOKEN_LICENSE := GPL-2.0
+PYTHON3_SHIBOKEN_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/python3-systemd.make b/rules/python3-systemd.make
index 66733e6a2..820275417 100644
--- a/rules/python3-systemd.make
+++ b/rules/python3-systemd.make
@@ -23,7 +23,7 @@ PYTHON3_SYSTEMD_SUFFIX := tar.gz
PYTHON3_SYSTEMD_URL := https://github.com/systemd/python-systemd/archive/v$(PYTHON3_SYSTEMD_VERSION).$(PYTHON3_SYSTEMD_SUFFIX)
PYTHON3_SYSTEMD_SOURCE := $(SRCDIR)/$(PYTHON3_SYSTEMD).$(PYTHON3_SYSTEMD_SUFFIX)
PYTHON3_SYSTEMD_DIR := $(BUILDDIR)/$(PYTHON3_SYSTEMD)
-PYTHON3_SYSTEMD_LICENSE := LGPL-2.1+
+PYTHON3_SYSTEMD_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/qrencode.make b/rules/qrencode.make
index d072e3622..c46eebe8d 100644
--- a/rules/qrencode.make
+++ b/rules/qrencode.make
@@ -23,7 +23,7 @@ QRENCODE_SUFFIX := tar.gz
QRENCODE_URL := https://fukuchi.org/works/qrencode/$(QRENCODE).$(QRENCODE_SUFFIX)
QRENCODE_SOURCE := $(SRCDIR)/$(QRENCODE).$(QRENCODE_SUFFIX)
QRENCODE_DIR := $(BUILDDIR)/$(QRENCODE)
-QRENCODE_LICENSE := LGPL-2.1+
+QRENCODE_LICENSE := LGPL-2.1-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/qt4.make b/rules/qt4.make
index 2ba0fd00a..c0ad325b7 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 AND LGPL-2.1
+QT4_LICENSE := GPL3 AND LGPL-2.1-only
ifdef PTXCONF_QT4_EXAMPLES
QT4_DEVPKG := NO
endif
diff --git a/rules/qt5.make b/rules/qt5.make
index 9b6550f60..0233f15eb 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 AND Nokia-Qt-exception-1.1 AND LGPL-3.0 AND GFDL-1.3
+QT5_LICENSE := LGPL-2.1-only AND Nokia-Qt-exception-1.1 AND LGPL-3.0-only AND GFDL-1.3-only
QT5_LICENSE_FILES := \
file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
diff --git a/rules/quagga.make b/rules/quagga.make
index 9f026ad14..a471ac521 100644
--- a/rules/quagga.make
+++ b/rules/quagga.make
@@ -23,7 +23,7 @@ QUAGGA_SUFFIX := tar.gz
QUAGGA_URL := http://download.savannah.gnu.org/releases/quagga/$(QUAGGA).$(QUAGGA_SUFFIX)
QUAGGA_SOURCE := $(SRCDIR)/$(QUAGGA).$(QUAGGA_SUFFIX)
QUAGGA_DIR := $(BUILDDIR)/$(QUAGGA)
-QUAGGA_LICENSE := GPL-2.0
+QUAGGA_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/quota-tools.make b/rules/quota-tools.make
index 1b5b9699e..ac8f70c91 100644
--- a/rules/quota-tools.make
+++ b/rules/quota-tools.make
@@ -24,7 +24,7 @@ QUOTA_TOOLS_PACKAGE := quota-$(QUOTA_TOOLS_VERSION).${QUOTA_TOOLS_SUFFIX}
QUOTA_TOOLS_URL := $(call ptx/mirror, SF, linuxquota/$(QUOTA_TOOLS_PACKAGE))
QUOTA_TOOLS_SOURCE := $(SRCDIR)/$(QUOTA_TOOLS_PACKAGE)
QUOTA_TOOLS_DIR := $(BUILDDIR)/$(QUOTA_TOOLS)
-QUOTA_TOOLS_LICENSE := GPL-2.0
+QUOTA_TOOLS_LICENSE := GPL-2.0-only
#
# autoconf
diff --git a/rules/qwt5.make b/rules/qwt5.make
index f4dfe884b..65977624e 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 AND QWT-1.0
+QWT5_LICENSE := LGPL-2.1-only AND QWT-1.0
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/rauc.make b/rules/rauc.make
index c7879f348..a7ecaf0e9 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -23,7 +23,7 @@ RAUC_SUFFIX := tar.xz
RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
RAUC_SOURCE := $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
RAUC_DIR := $(BUILDDIR)/$(RAUC)
-RAUC_LICENSE := LGPL-2.1
+RAUC_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/readline.make b/rules/readline.make
index 385777c5d..be3928c78 100644
--- a/rules/readline.make
+++ b/rules/readline.make
@@ -24,7 +24,7 @@ READLINE_SUFFIX := tar.gz
READLINE_URL := $(call ptx/mirror, GNU, readline/$(READLINE).$(READLINE_SUFFIX))
READLINE_SOURCE := $(SRCDIR)/$(READLINE).$(READLINE_SUFFIX)
READLINE_DIR := $(BUILDDIR)/$(READLINE)
-READLINE_LICENSE := GPL-3.0+
+READLINE_LICENSE := GPL-3.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/rng-tools.make b/rules/rng-tools.make
index 4061a0ec5..5f50225fc 100644
--- a/rules/rng-tools.make
+++ b/rules/rng-tools.make
@@ -17,7 +17,7 @@ RNG_TOOLS_SUFFIX := tar.gz
RNG_TOOLS_URL := $(call ptx/mirror, SF, gkernel/$(RNG_TOOLS).$(RNG_TOOLS_SUFFIX))
RNG_TOOLS_SOURCE := $(SRCDIR)/$(RNG_TOOLS).$(RNG_TOOLS_SUFFIX)
RNG_TOOLS_DIR := $(BUILDDIR)/$(RNG_TOOLS)
-RNG_TOOLS_LICENSE := GPL-2.0
+RNG_TOOLS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/rrdtool.make b/rules/rrdtool.make
index 4f5024c9f..4c47cc823 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -23,7 +23,7 @@ RRDTOOL_SUFFIX := tar.gz
RRDTOOL_URL := http://oss.oetiker.ch/rrdtool/pub/$(RRDTOOL).$(RRDTOOL_SUFFIX)
RRDTOOL_SOURCE := $(SRCDIR)/$(RRDTOOL).$(RRDTOOL_SUFFIX)
RRDTOOL_DIR := $(BUILDDIR)/$(RRDTOOL)
-RRDTOOL_LICENSE := GPL-2.0+
+RRDTOOL_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/rsync3.make b/rules/rsync3.make
index 60d97d8f7..b9e64965c 100644
--- a/rules/rsync3.make
+++ b/rules/rsync3.make
@@ -23,7 +23,7 @@ RSYNC3_SUFFIX := tar.gz
RSYNC3_URL := http://rsync.samba.org/ftp/rsync/src/$(RSYNC3).$(RSYNC3_SUFFIX)
RSYNC3_SOURCE := $(SRCDIR)/$(RSYNC3).$(RSYNC3_SUFFIX)
RSYNC3_DIR := $(BUILDDIR)/$(RSYNC3)
-RSYNC3_LICENSE := GPL-3.0
+RSYNC3_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/rsyslog.make b/rules/rsyslog.make
index 4dcd76954..f718b04bc 100644
--- a/rules/rsyslog.make
+++ b/rules/rsyslog.make
@@ -23,7 +23,7 @@ RSYSLOG_SUFFIX := tar.gz
RSYSLOG_URL := http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX)
RSYSLOG_SOURCE := $(SRCDIR)/$(RSYSLOG).$(RSYSLOG_SUFFIX)
RSYSLOG_DIR := $(BUILDDIR)/$(RSYSLOG)
-RSYSLOG_LICENSE := GPL-3.0+ AND LGPL-3.0+ AND Apache-2.0
+RSYSLOG_LICENSE := GPL-3.0-or-later AND LGPL-3.0-or-later AND Apache-2.0
RSYSLOG_LICENSE_FILES := \
file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \
file://COPYING.LESSER;md5=cb7903f1e5c39ae838209e130dca270a \
diff --git a/rules/rt-tests.make b/rules/rt-tests.make
index 4bc33e315..f3c38fe3f 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 AND GPL-2.0+
+RT_TESTS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later
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 5c82a10f8..d3c8be6dc 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+ AND GPL-2.0+
+RTMPDUMP_LICENSE := LGPL-2.1-or-later AND GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/rtps.make b/rules/rtps.make
index 5fb2fcebb..e6393fd19 100644
--- a/rules/rtps.make
+++ b/rules/rtps.make
@@ -14,7 +14,7 @@
PACKAGES-$(PTXCONF_RTPS) += rtps
RTPS_VERSION := 1.0
-RTPS_LICENSE := GPL-2.0
+RTPS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/rxtx.make b/rules/rxtx.make
index e2a21e133..12f0d6735 100644
--- a/rules/rxtx.make
+++ b/rules/rxtx.make
@@ -23,7 +23,7 @@ RXTX_SUFFIX := zip
RXTX_URL := http://rxtx.qbang.org/pub/rxtx/$(RXTX).$(RXTX_SUFFIX)
RXTX_SOURCE := $(SRCDIR)/$(RXTX).$(RXTX_SUFFIX)
RXTX_DIR := $(BUILDDIR)/$(RXTX)
-RXTX_LICENSE := LGPL-2.1
+RXTX_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/samba.make b/rules/samba.make
index 199f69470..efe40a1f9 100644
--- a/rules/samba.make
+++ b/rules/samba.make
@@ -23,7 +23,7 @@ SAMBA := samba-$(SAMBA_VERSION)
SAMBA_SUFFIX := tar.gz
SAMBA_SOURCE := $(SRCDIR)/$(SAMBA).$(SAMBA_SUFFIX)
SAMBA_DIR := $(BUILDDIR)/$(SAMBA)
-SAMBA_LICENSE := GPL-2.0
+SAMBA_LICENSE := GPL-2.0-only
SAMBA_URL := \
http://www.samba.org/samba/ftp/stable/$(SAMBA).$(SAMBA_SUFFIX) \
diff --git a/rules/sched_switch.make b/rules/sched_switch.make
index 0be4919d0..99c07f89d 100644
--- a/rules/sched_switch.make
+++ b/rules/sched_switch.make
@@ -23,7 +23,7 @@ SCHED_SWITCH_SUFFIX := tgz
SCHED_SWITCH_URL := http://www.osadl.org/uploads/media/$(SCHED_SWITCH).$(SCHED_SWITCH_SUFFIX)
SCHED_SWITCH_SOURCE := $(SRCDIR)/$(SCHED_SWITCH).$(SCHED_SWITCH_SUFFIX)
SCHED_SWITCH_DIR := $(BUILDDIR)/$(SCHED_SWITCH)
-SCHED_SWITCH_LICENSE := GPL-2.0
+SCHED_SWITCH_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/schedtool.make b/rules/schedtool.make
index 60cbfc910..42de05054 100644
--- a/rules/schedtool.make
+++ b/rules/schedtool.make
@@ -23,7 +23,7 @@ SCHEDTOOL_SUFFIX := tar.bz2
SCHEDTOOL_URL := http://freequaos.host.sk/schedtool/$(SCHEDTOOL).$(SCHEDTOOL_SUFFIX)
SCHEDTOOL_SOURCE := $(SRCDIR)/$(SCHEDTOOL).$(SCHEDTOOL_SUFFIX)
SCHEDTOOL_DIR := $(BUILDDIR)/$(SCHEDTOOL)
-SCHEDTOOL_LICENSE := GPL-2.0
+SCHEDTOOL_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/screen.make b/rules/screen.make
index 64cc7f514..d152fc864 100644
--- a/rules/screen.make
+++ b/rules/screen.make
@@ -23,7 +23,7 @@ SCREEN_SUFFIX := tar.gz
SCREEN_URL := $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX))
SCREEN_SOURCE := $(SRCDIR)/$(SCREEN).$(SCREEN_SUFFIX)
SCREEN_DIR := $(BUILDDIR)/$(SCREEN)
-SCREEN_LICENSE := GPL-2.0+
+SCREEN_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sdl.make b/rules/sdl.make
index 821f3ff3d..bc97edb73 100644
--- a/rules/sdl.make
+++ b/rules/sdl.make
@@ -24,7 +24,7 @@ SDL_SUFFIX := tar.gz
SDL_URL := http://www.libsdl.org/release/$(SDL).$(SDL_SUFFIX)
SDL_SOURCE := $(SRCDIR)/$(SDL).$(SDL_SUFFIX)
SDL_DIR := $(BUILDDIR)/$(SDL)
-SDL_LICENSE := LGPL-2.1
+SDL_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sdl_image.make b/rules/sdl_image.make
index 44d2c322c..4f6ea8425 100644
--- a/rules/sdl_image.make
+++ b/rules/sdl_image.make
@@ -23,7 +23,7 @@ SDL_IMAGE_SUFFIX := tar.gz
SDL_IMAGE_URL := http://www.libsdl.org/projects/SDL_image/release/$(SDL_IMAGE).$(SDL_IMAGE_SUFFIX)
SDL_IMAGE_SOURCE := $(SRCDIR)/$(SDL_IMAGE).$(SDL_IMAGE_SUFFIX)
SDL_IMAGE_DIR := $(BUILDDIR)/$(SDL_IMAGE)
-SDL_IMAGE_LICENSE := LGPL-2.1
+SDL_IMAGE_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sdl_mixer.make b/rules/sdl_mixer.make
index 063ded1cd..6015ad555 100644
--- a/rules/sdl_mixer.make
+++ b/rules/sdl_mixer.make
@@ -24,7 +24,7 @@ SDL_MIXER_SUFFIX := tar.gz
SDL_MIXER_URL := http://www.libsdl.org/projects/SDL_mixer/release/$(SDL_MIXER).$(SDL_MIXER_SUFFIX)
SDL_MIXER_SOURCE := $(SRCDIR)/$(SDL_MIXER).$(SDL_MIXER_SUFFIX)
SDL_MIXER_DIR := $(BUILDDIR)/$(SDL_MIXER)
-SDL_MIXER_LICENSE := LGPL-2.1
+SDL_MIXER_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sed.make b/rules/sed.make
index e672230aa..cce8b2b2a 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 AND GNU Free Documentation License
+SED_LICENSE := GPL-3.0-only AND GNU Free Documentation License
SED_LICENSE_FILES := \
file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6
diff --git a/rules/sepolgen.make b/rules/sepolgen.make
index a761fae21..4e9124862 100644
--- a/rules/sepolgen.make
+++ b/rules/sepolgen.make
@@ -23,7 +23,7 @@ SEPOLGEN_SUFFIX := tar.gz
SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
SEPOLGEN_SOURCE := $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN)
-SEPOLGEN_LICENSE := GPL-2.0
+SEPOLGEN_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/smartmontools.make b/rules/smartmontools.make
index 865ade39f..5555fa855 100644
--- a/rules/smartmontools.make
+++ b/rules/smartmontools.make
@@ -23,7 +23,7 @@ SMARTMONTOOLS_SUFFIX := tar.gz
SMARTMONTOOLS_URL := $(call ptx/mirror, SF, smartmontools/$(SMARTMONTOOLS).$(SMARTMONTOOLS_SUFFIX))
SMARTMONTOOLS_SOURCE := $(SRCDIR)/$(SMARTMONTOOLS).$(SMARTMONTOOLS_SUFFIX)
SMARTMONTOOLS_DIR := $(BUILDDIR)/$(SMARTMONTOOLS)
-SMARTMONTOOLS_LICENSE := GPL-2.0
+SMARTMONTOOLS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/socat.make b/rules/socat.make
index c5622fb7a..f21d78bd4 100644
--- a/rules/socat.make
+++ b/rules/socat.make
@@ -21,7 +21,7 @@ SOCAT_SUFFIX := tar.gz
SOCAT_URL := http://www.dest-unreach.org/socat/download/$(SOCAT).$(SOCAT_SUFFIX)
SOCAT_SOURCE := $(SRCDIR)/$(SOCAT).$(SOCAT_SUFFIX)
SOCAT_DIR := $(BUILDDIR)/$(SOCAT)
-SOCAT_LICENSE := GPL-2.0
+SOCAT_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make
index c242f71fd..6bdc03635 100644
--- a/rules/squashfs-tools.make
+++ b/rules/squashfs-tools.make
@@ -28,7 +28,7 @@ SQUASHFS_TOOLS_URL := $(call ptx/mirror, SF, squashfs/$(SQUASHFS_TOOLS).$(SQUASH
SQUASHFS_TOOLS_SOURCE := $(SRCDIR)/$(SQUASHFS_TOOLS).$(SQUASHFS_TOOLS_SUFFIX)
SQUASHFS_TOOLS_DIR := $(BUILDDIR)/$(SQUASHFS_TOOLS)
SQUASHFS_TOOLS_SUBDIR := squashfs-tools
-SQUASHFS_TOOLS_LICENSE := GPL-2.0+
+SQUASHFS_TOOLS_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ssmtp.make b/rules/ssmtp.make
index c04ddfe04..aa3a4100d 100644
--- a/rules/ssmtp.make
+++ b/rules/ssmtp.make
@@ -25,7 +25,7 @@ SSMTP_SRC := ssmtp_$(SSMTP_VERSION).orig.$(SSMTP_SUFFIX)
SSMTP_URL := $(call ptx/mirror, DEB, pool/main/s/ssmtp/$(SSMTP_SRC))
SSMTP_SOURCE := $(SRCDIR)/$(SSMTP_SRC)
SSMTP_DIR := $(BUILDDIR)/ssmtp-$(SSMTP_VERSION)
-SSMTP_LICENSE := GPL-2.0+
+SSMTP_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/stress-ng.make b/rules/stress-ng.make
index 15969d2a1..3817185e6 100644
--- a/rules/stress-ng.make
+++ b/rules/stress-ng.make
@@ -23,7 +23,7 @@ STRESS_NG_SUFFIX := tar.xz
STRESS_NG_URL := http://kernel.ubuntu.com/~cking/tarballs/stress-ng/$(STRESS_NG).$(STRESS_NG_SUFFIX)
STRESS_NG_SOURCE := $(SRCDIR)/$(STRESS_NG).$(STRESS_NG_SUFFIX)
STRESS_NG_DIR := $(BUILDDIR)/$(STRESS_NG)
-STRESS_NG_LICENSE := GPL-2.0+
+STRESS_NG_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/stress.make b/rules/stress.make
index 13c82ab29..a9f5d6d03 100644
--- a/rules/stress.make
+++ b/rules/stress.make
@@ -23,7 +23,7 @@ STRESS_SUFFIX := tar.gz
STRESS_URL := https://people.seas.harvard.edu/~apw/stress/$(STRESS).$(STRESS_SUFFIX)
STRESS_SOURCE := $(SRCDIR)/$(STRESS).$(STRESS_SUFFIX)
STRESS_DIR := $(BUILDDIR)/$(STRESS)
-STRESS_LICENSE := GPL-2.0+
+STRESS_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 8378b48c1..dd863027a 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+ AND LGPL-2.1
+SYSLOGNG_LICENSE := GPL-2.0-or-later AND LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sysstat.make b/rules/sysstat.make
index 8819a9fc4..feb0dc274 100644
--- a/rules/sysstat.make
+++ b/rules/sysstat.make
@@ -23,7 +23,7 @@ SYSSTAT_SUFFIX := tar.xz
SYSSTAT_URL := http://pagesperso-orange.fr/sebastien.godard/$(SYSSTAT).$(SYSSTAT_SUFFIX)
SYSSTAT_SOURCE := $(SRCDIR)/$(SYSSTAT).$(SYSSTAT_SUFFIX)
SYSSTAT_DIR := $(BUILDDIR)/$(SYSSTAT)
-SYSSTAT_LICENSE := GPL-2.0+
+SYSSTAT_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/systemd-bootchart.make b/rules/systemd-bootchart.make
index b46564f0c..3e18ae624 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+ AND LGPL-2.1
+SYSTEMD_BOOTCHART_LICENSE := GPL-2.0-or-later AND LGPL-2.1-only
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 4f6456120..a045a9818 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+ AND LGPL-2.1
+SYSTEMD_LICENSE := GPL-2.0-or-later AND LGPL-2.1-only
SYSTEMD_LICENSE_FILES := \
file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c
diff --git a/rules/termcap.make b/rules/termcap.make
index 07b16d38c..e5f36fbc9 100644
--- a/rules/termcap.make
+++ b/rules/termcap.make
@@ -23,7 +23,7 @@ TERMCAP_SUFFIX := tar.gz
TERMCAP_URL := $(call ptx/mirror, GNU, termcap/$(TERMCAP).$(TERMCAP_SUFFIX))
TERMCAP_SOURCE := $(SRCDIR)/$(TERMCAP).$(TERMCAP_SUFFIX)
TERMCAP_DIR := $(BUILDDIR)/$(TERMCAP)
-TERMCAP_LICENSE := GPL-2.0
+TERMCAP_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/tntnet.make b/rules/tntnet.make
index 3b65804b1..2e4a056d9 100644
--- a/rules/tntnet.make
+++ b/rules/tntnet.make
@@ -23,7 +23,7 @@ TNTNET_SUFFIX := tar.gz
TNTNET_URL := http://www.tntnet.org/download/$(TNTNET).$(TNTNET_SUFFIX)
TNTNET_SOURCE := $(SRCDIR)/$(TNTNET).$(TNTNET_SUFFIX)
TNTNET_DIR := $(BUILDDIR)/$(TNTNET)
-TNTNET_LICENSE := LGPL-2.1
+TNTNET_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/trace-cmd.make b/rules/trace-cmd.make
index 4ee1b0271..64fabf691 100644
--- a/rules/trace-cmd.make
+++ b/rules/trace-cmd.make
@@ -23,7 +23,7 @@ TRACE_CMD_SUFFIX := tar.bz2
TRACE_CMD_URL := http://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;tag=trace-cmd-v$(TRACE_CMD_VERSION)
TRACE_CMD_SOURCE := $(SRCDIR)/$(TRACE_CMD).$(TRACE_CMD_SUFFIX)
TRACE_CMD_DIR := $(BUILDDIR)/$(TRACE_CMD)
-TRACE_CMD_LICENSE := GPL-2.0
+TRACE_CMD_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index 7bc557246..9a3aacd19 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -23,7 +23,7 @@ U_BOOT_TOOLS_SUFFIX := tar.bz2
U_BOOT_TOOLS_URL := ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
U_BOOT_TOOLS_DIR := $(BUILDDIR)/u-boot-tools-$(U_BOOT_TOOLS_VERSION)
-U_BOOT_TOOLS_LICENSE := GPL-2.0
+U_BOOT_TOOLS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/udev.make b/rules/udev.make
index d3530cf6a..0d4442d5e 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -24,7 +24,7 @@ UDEV_LEGACY_SUFFIX := tar.bz2
UDEV_LEGACY_URL := $(call ptx/mirror, KERNEL, utils/kernel/hotplug/$(UDEV_LEGACY).$(UDEV_LEGACY_SUFFIX))
UDEV_LEGACY_SOURCE := $(SRCDIR)/$(UDEV_LEGACY).$(UDEV_LEGACY_SUFFIX)
UDEV_LEGACY_DIR := $(BUILDDIR)/$(UDEV_LEGACY)
-UDEV_LEGACY_LICENSE := GPL-2.0
+UDEV_LEGACY_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/unstrung.make b/rules/unstrung.make
index 85ee845a6..e497223d0 100644
--- a/rules/unstrung.make
+++ b/rules/unstrung.make
@@ -23,7 +23,7 @@ UNSTRUNG_SUFFIX := tar.gz
UNSTRUNG_URL := http://unstrung.sandelman.ca/downloads/$(UNSTRUNG).$(UNSTRUNG_SUFFIX)
UNSTRUNG_SOURCE := $(SRCDIR)/$(UNSTRUNG).$(UNSTRUNG_SUFFIX)
UNSTRUNG_DIR := $(BUILDDIR)/$(UNSTRUNG)
-UNSTRUNG_LICENSE := GPL-2.0+
+UNSTRUNG_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/upower.make b/rules/upower.make
index 4493eaa89..1f9c57ede 100644
--- a/rules/upower.make
+++ b/rules/upower.make
@@ -23,7 +23,7 @@ UPOWER_SUFFIX := tar.xz
UPOWER_URL := https://upower.freedesktop.org/releases/$(UPOWER).$(UPOWER_SUFFIX)
UPOWER_SOURCE := $(SRCDIR)/$(UPOWER).$(UPOWER_SUFFIX)
UPOWER_DIR := $(BUILDDIR)/$(UPOWER)
-UPOWER_LICENSE := GPL-2.0+
+UPOWER_LICENSE := GPL-2.0-or-later
UPOWER_LICENSE_FILES := file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08
# ----------------------------------------------------------------------------
diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make
index 255650282..d3f6addd1 100644
--- a/rules/usb-modeswitch-data.make
+++ b/rules/usb-modeswitch-data.make
@@ -23,7 +23,7 @@ USB_MODESWITCH_DATA_SUFFIX := tar.bz2
USB_MODESWITCH_DATA_URL := http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
USB_MODESWITCH_DATA_SOURCE := $(SRCDIR)/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
USB_MODESWITCH_DATA_DIR := $(BUILDDIR)/$(USB_MODESWITCH_DATA)
-USB_MODESWITCH_DATA_LICENSE := GPL-2.0
+USB_MODESWITCH_DATA_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 585fa9eb5..193a6eede 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -23,7 +23,7 @@ USB_MODESWITCH_SUFFIX := tar.bz2
USB_MODESWITCH_URL := http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
USB_MODESWITCH_SOURCE := $(SRCDIR)/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
USB_MODESWITCH_DIR := $(BUILDDIR)/$(USB_MODESWITCH)
-USB_MODESWITCH_LICENSE := GPL-2.0
+USB_MODESWITCH_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/usbutils.make b/rules/usbutils.make
index 67b4ce80c..4cbc6e27e 100644
--- a/rules/usbutils.make
+++ b/rules/usbutils.make
@@ -24,7 +24,7 @@ USBUTILS_SUFFIX := tar.xz
USBUTILS_URL := $(call ptx/mirror, KERNEL, utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX))
USBUTILS_SOURCE := $(SRCDIR)/$(USBUTILS).$(USBUTILS_SUFFIX)
USBUTILS_DIR := $(BUILDDIR)/$(USBUTILS)
-USBUTILS_LICENSE := GPL-2.0
+USBUTILS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/ustr.make b/rules/ustr.make
index b1693bd06..64673d91a 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+ AND MIT AND BSD
+USTR_LICENSE := LGPL-2.0-or-later AND MIT AND BSD
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 488b4967f..2464909c7 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 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 := GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.0-or-later 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/v4l-utils.make b/rules/v4l-utils.make
index 322038732..79b69db36 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -23,7 +23,7 @@ V4L_UTILS_SUFFIX := tar.bz2
V4L_UTILS_URL := http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
V4L_UTILS_SOURCE := $(SRCDIR)/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
V4L_UTILS_DIR := $(BUILDDIR)/$(V4L_UTILS)
-V4L_UTILS_LICENSE := GPL-2.0+ (tools); LGPL-2.1+ (libs)
+V4L_UTILS_LICENSE := GPL-2.0-or-later (tools); LGPL-2.1-or-later (libs)
V4L_UTILS_LICENSE_FILES := \
file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
file://COPYING.libdvbv5;md5=28fb0f8e5cecc8a7a1a88008019dc3d0 \
diff --git a/rules/valgrind.make b/rules/valgrind.make
index afb7fabfb..806296b28 100644
--- a/rules/valgrind.make
+++ b/rules/valgrind.make
@@ -26,7 +26,7 @@ VALGRIND_SUFFIX := tar.bz2
VALGRIND_URL := http://valgrind.org/downloads/$(VALGRIND).$(VALGRIND_SUFFIX)
VALGRIND_SOURCE := $(SRCDIR)/$(VALGRIND).$(VALGRIND_SUFFIX)
VALGRIND_DIR := $(BUILDDIR)/$(VALGRIND)
-VALGRIND_LICENSE := GPL-2.0
+VALGRIND_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/vorbis-tools.make b/rules/vorbis-tools.make
index e70992682..97e8d1f8c 100644
--- a/rules/vorbis-tools.make
+++ b/rules/vorbis-tools.make
@@ -23,7 +23,7 @@ VORBIS_TOOLS_SUFFIX := tar.gz
VORBIS_TOOLS_URL := http://downloads.xiph.org/releases/vorbis/$(VORBIS_TOOLS).$(VORBIS_TOOLS_SUFFIX)
VORBIS_TOOLS_SOURCE := $(SRCDIR)/$(VORBIS_TOOLS).$(VORBIS_TOOLS_SUFFIX)
VORBIS_TOOLS_DIR := $(BUILDDIR)/$(VORBIS_TOOLS)
-VORBIS_TOOLS_LICENSE := GPL-2.0
+VORBIS_TOOLS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/watchdog.make b/rules/watchdog.make
index bab8d78aa..5f2b9bcaf 100644
--- a/rules/watchdog.make
+++ b/rules/watchdog.make
@@ -23,7 +23,7 @@ WATCHDOG_SUFFIX := tar.gz
WATCHDOG_URL := $(call ptx/mirror, SF, watchdog/$(WATCHDOG).$(WATCHDOG_SUFFIX))
WATCHDOG_SOURCE := $(SRCDIR)/$(WATCHDOG).$(WATCHDOG_SUFFIX)
WATCHDOG_DIR := $(BUILDDIR)/$(WATCHDOG)
-WATCHDOG_LICENSE := GPL-2.0
+WATCHDOG_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/which.make b/rules/which.make
index f5bd76b67..fef2b4339 100644
--- a/rules/which.make
+++ b/rules/which.make
@@ -23,7 +23,7 @@ WHICH_SUFFIX := tar.gz
WHICH_URL := $(call ptx/mirror, GNU, which/$(WHICH).$(WHICH_SUFFIX))
WHICH_SOURCE := $(SRCDIR)/$(WHICH).$(WHICH_SUFFIX)
WHICH_DIR := $(BUILDDIR)/$(WHICH)
-WHICH_LICENSE := GPL-3.0
+WHICH_LICENSE := GPL-3.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/wireless.make b/rules/wireless.make
index 30c899aa6..2c5f1faef 100644
--- a/rules/wireless.make
+++ b/rules/wireless.make
@@ -25,7 +25,7 @@ WIRELESS_SUFFIX := tar.gz
WIRELESS_URL := http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$(WIRELESS).$(WIRELESS_SUFFIX)
WIRELESS_SOURCE := $(SRCDIR)/$(WIRELESS).$(WIRELESS_SUFFIX)
WIRELESS_DIR := $(BUILDDIR)/wireless_tools.$(WIRELESS_VERSION)
-WIRELESS_LICENSE := GPL-2.0
+WIRELESS_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make
index d9b57c6a9..1c841d669 100644
--- a/rules/wpa_supplicant.make
+++ b/rules/wpa_supplicant.make
@@ -28,7 +28,7 @@ WPA_SUPPLICANT_SUBDIR := $(WPA_SUPPLICANT_NAME)
# Use '=' to delay $(shell ...) calls until this is needed
WPA_SUPPLICANT_DEFCONF = $(shell ptxd_get_alternative config/wpasupplicant defconfig && echo $$ptxd_reply)
WPA_SUPPLICANT_CONFIG := $(BUILDDIR)/$(WPA_SUPPLICANT)/$(WPA_SUPPLICANT_SUBDIR)/.config
-WPA_SUPPLICANT_LICENSE := GPL-2.0
+WPA_SUPPLICANT_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/xfsprogs.make b/rules/xfsprogs.make
index b63776d7e..8f50d3981 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 AND LGPL-2.1
+XFSPROGS_LICENSE:= GPL-2.0-only AND LGPL-2.1-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/xz.make b/rules/xz.make
index f969bc7b2..b44881f75 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 AND LGPL-2.1+ AND GPL-2.0+ AND GPL-3.0+
+XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later
XZ_LICENSE_FILES := \
file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \