ptxconfigs: update license data

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

18 files changed, 89 insertions, 89 deletions

diff --git a/ptxconfigs/aarch64-v8a-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/aarch64-v8a-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 181dddb..e9b0f97 100644
--- a/ptxconfigs/aarch64-v8a-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/aarch64-v8a-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-abi=lp64 --with-arch=armv8-a --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 0815201..5df3e8d 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=vfp --with-cpu=arm1136jf-s --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 8aa0615..0c0ab1b 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=vfp --with-cpu=arm1136jf-s --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 82fb6fe..3012cc4 100644
--- a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv4t --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 1595e45..a176c0f 100644
--- a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-v7a-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/arm-v7a-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index c8bbee9..775b2c3 100644
--- a/ptxconfigs/arm-v7a-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7a-linux-gnueabi_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=vfpv3-d16 --with-arch=armv7-a --with-mode=thumb --with-tune=cortex-a9 --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 5678200..028351e 100644
--- a/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a --with-mode=thumb --with-tune=cortex-a9 --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-v7em-eabihf_gcc-8.2.1_newlib-3.0.0_binutils-2.31.1.ptxconfig b/ptxconfigs/arm-v7em-eabihf_gcc-8.2.1_newlib-3.0.0_binutils-2.31.1.ptxconfig
index c583b65..ac265ef 100644
--- a/ptxconfigs/arm-v7em-eabihf_gcc-8.2.1_newlib-3.0.0_binutils-2.31.1.ptxconfig
+++ b/ptxconfigs/arm-v7em-eabihf_gcc-8.2.1_newlib-3.0.0_binutils-2.31.1.ptxconfig
@@ -41,7 +41,7 @@ PTXCONF_NEWLIB_MD5="b55db6531699879591e9fc7e4c2adc51"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 # PTXCONF_KERNEL_HEADERS is not set
@@ -56,9 +56,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=fpv4-sp-d16 --with-arch=armv7e-m --with-mode=thumb"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -86,7 +86,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-8.2.1_uclibc-ng-1.0.31_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-8.2.1_uclibc-ng-1.0.31_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 288e485..2a03afc 100644
--- a/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-8.2.1_uclibc-ng-1.0.31_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-8.2.1_uclibc-ng-1.0.31_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -38,14 +38,14 @@ PTXCONF_UCLIBC=y
 PTXCONF_UCLIBC_VERSION="ng-1.0.31"
 PTXCONF_UCLIBC_MD5="2b96be86e441e47b47fcb683f066d822"
 PTXCONF_UCLIBC_CONFIG="uclibc-${PTXCONF_UCLIBC_VERSION}-${PTXCONF_GNU_TARGET}.config"
-PTXCONF_UCLIBC_LICENSE="LGPL-2.1+"
+PTXCONF_UCLIBC_LICENSE="LGPL-2.1-or-later"
 PTXCONF_UCLIBC_LICENSE_FILES="file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343"
 PTXCONF_UCLIBC_HEADERS=y
 PTXCONF_UCLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_ELF2FLT=y
 PTXCONF_KERNEL_HEADERS=y
@@ -63,9 +63,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=fpv4-sp-d16 --with-arch=armv7e-m --with-mode=thumb"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -90,7 +90,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-v7m-eabi_gcc-8.2.1_newlib-3.0.0_binutils-2.31.1.ptxconfig b/ptxconfigs/arm-v7m-eabi_gcc-8.2.1_newlib-3.0.0_binutils-2.31.1.ptxconfig
index 0fe9e25..dc06f57 100644
--- a/ptxconfigs/arm-v7m-eabi_gcc-8.2.1_newlib-3.0.0_binutils-2.31.1.ptxconfig
+++ b/ptxconfigs/arm-v7m-eabi_gcc-8.2.1_newlib-3.0.0_binutils-2.31.1.ptxconfig
@@ -41,7 +41,7 @@ PTXCONF_NEWLIB_MD5="b55db6531699879591e9fc7e4c2adc51"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 # PTXCONF_KERNEL_HEADERS is not set
@@ -56,9 +56,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv7-m --with-mode=thumb"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -86,7 +86,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/arm-v7m-uclinuxeabi_gcc-8.2.1_uclibc-ng-1.0.31_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/arm-v7m-uclinuxeabi_gcc-8.2.1_uclibc-ng-1.0.31_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 62b4188..ce353e4 100644
--- a/ptxconfigs/arm-v7m-uclinuxeabi_gcc-8.2.1_uclibc-ng-1.0.31_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7m-uclinuxeabi_gcc-8.2.1_uclibc-ng-1.0.31_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -38,14 +38,14 @@ PTXCONF_UCLIBC=y
 PTXCONF_UCLIBC_VERSION="ng-1.0.31"
 PTXCONF_UCLIBC_MD5="2b96be86e441e47b47fcb683f066d822"
 PTXCONF_UCLIBC_CONFIG="uclibc-${PTXCONF_UCLIBC_VERSION}-${PTXCONF_GNU_TARGET}.config"
-PTXCONF_UCLIBC_LICENSE="LGPL-2.1+"
+PTXCONF_UCLIBC_LICENSE="LGPL-2.1-or-later"
 PTXCONF_UCLIBC_LICENSE_FILES="file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343"
 PTXCONF_UCLIBC_HEADERS=y
 PTXCONF_UCLIBC_HEADERS_FAKE_CROSS="-D__ARM_EABI__"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_ELF2FLT=y
 PTXCONF_KERNEL_HEADERS=y
@@ -63,9 +63,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-arch=armv7-m --with-mode=thumb"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -90,7 +90,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/i586-unknown-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/i586-unknown-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index a7ca95a..38c8a433 100644
--- a/ptxconfigs/i586-unknown-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/i586-unknown-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=i586 --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/i686-atom-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/i686-atom-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 0ef04f1..87bf841 100644
--- a/ptxconfigs/i686-atom-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/i686-atom-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-arch=atom --with-fpmath=sse --with-specs='%{!mmovbe:%{!mno-movbe:-mno-movbe}}' --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/mips-softfloat-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/mips-softfloat-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 204b655..bd56333 100644
--- a/ptxconfigs/mips-softfloat-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/mips-softfloat-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-DBOOTSTRAP_GCC -D_MIPS_SIM=_ABIO32"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 723fc61..68474b2 100644
--- a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-DBOOTSTRAP_GCC -D_MIPS_SIM=_ABIO32"
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/powerpc-603e-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/powerpc-603e-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index 69a426d..2d00fe4 100644
--- a/ptxconfigs/powerpc-603e-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/powerpc-603e-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-cpu=603e --disable-altivec --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
diff --git a/ptxconfigs/riscv64-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.15-sanitized.ptxconfig b/ptxconfigs/riscv64-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.15-sanitized.ptxconfig
index ebc5bf5..6c908e9 100644
--- a/ptxconfigs/riscv64-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.15-sanitized.ptxconfig
+++ b/ptxconfigs/riscv64-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.15-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS="-D__riscv_atomic -D__riscv_xlen=64 -D__riscv_f
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA=" --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,8 +95,8 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE=""
-PTXCONF_CROSS_GDB_LICENSE_FILES=""
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
+PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y
 PTXCONF_HOST_EXPAT=y
diff --git a/ptxconfigs/x86_64-unknown-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig b/ptxconfigs/x86_64-unknown-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
index dc1aff7..c6fd76f 100644
--- a/ptxconfigs/x86_64-unknown-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
+++ b/ptxconfigs/x86_64-unknown-linux-gnu_gcc-8.2.1_glibc-2.28_binutils-2.31.1_kernel-4.19-sanitized.ptxconfig
@@ -40,7 +40,7 @@ PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
 PTXCONF_GLIBC_VERSION="2.28"
 PTXCONF_GLIBC_MD5="191dc6cff5cc9a5a711ca94f56c97681"
-PTXCONF_GLIBC_LICENSE="GPL-2.0+ AND LGPL-2.1+"
+PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
@@ -51,7 +51,7 @@ PTXCONF_GLIBC_HEADERS_FAKE_CROSS=""
 PTXCONF_CROSS_BINUTILS=y
 PTXCONF_CROSS_BINUTILS_VERSION="2.31.1"
 PTXCONF_CROSS_BINUTILS_MD5="84edf97113788f106d6ee027f10b046a"
-PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 # PTXCONF_CROSS_ELF2FLT is not set
 PTXCONF_KERNEL_HEADERS=y
@@ -69,9 +69,9 @@ PTXCONF_CROSS_GCC_48=y
 PTXCONF_CROSS_GCC_50=y
 PTXCONF_CROSS_GCC_SERIES=""
 PTXCONF_CROSS_GCC_CONFIG_EXTRA=" --enable-linker-build-id"
-PTXCONF_CROSS_GCC_LICENSE="GPL-2.0+ WITH Classpath-exception-2.0 AND LGPL-2.1+ AND GPL-3.0+ AND GPL-3.0+ WITH GCC-exception-3.1 AND LGPL-3.0+"
+PTXCONF_CROSS_GCC_LICENSE="GPL-2.0-or-later WITH Classpath-exception-2.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1 AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GCC_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0 WITH GCC-exception-3.1"
+PTXCONF_CROSS_GCC_GCCLIBS_LICENSE="GPL-3.0-only WITH GCC-exception-3.1"
 PTXCONF_CROSS_GCC_GCCLIBS_LICENSES="COPYING3 COPYING.RUNTIME"
 
 #
@@ -95,7 +95,7 @@ PTXCONF_CROSS_GCC_FIRST=y
 PTXCONF_CROSS_GDB=y
 PTXCONF_CROSS_GDB_VERSION="8.2"
 PTXCONF_CROSS_GDB_MD5="b5a49dbff00d9a87fbe114d14b3101c0"
-PTXCONF_CROSS_GDB_LICENSE="GPL-2.0+ AND LGPL-2.0+ GPL-3.0+ AND LGPL-3.0+"
+PTXCONF_CROSS_GDB_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_GDB_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 PTXCONF_CROSS_TOOLCHAIN=y
 PTXCONF_HOST_FAKE_MAKEINFO=y