package: use SPDX short identifier for OFL license
PATCH 1/9 package: use SPDX short identifier for OFL license
We want to use SPDX identifier for license string as much as possible. SPDX short identifier for OFLv1.0/OFLv1.1 is OFL-1.0/OFL-1.1.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/OFLv([1]\.[0-1])/OFL-\1/g'
Signed-off-by Rahul Bedarkar <[email protected]>
--- package/cantarell/cantarell.mk | 2 +- package/font-awesome/font-awesome.mk | 2 +- package/googlefontdirectory/googlefontdirectory.mk | 2 +- package/inconsolata/inconsolata.mk | 2 +- package/liberation/liberation.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
package/cantarell/cantarell.mk +1 -1
@@ -9,7 +9,7 @@ CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).25 CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz CANTARELL_DEPENDENCIES = host-pkgconf -CANTARELL_LICENSE = OFLv1.1 +CANTARELL_LICENSE = OFL-1.1 CANTARELL_LICENSE_FILES = COPYING $(eval $(autotools-package))
package/font-awesome/font-awesome.mk +1 -1
@@ -6,7 +6,7 @@ FONT_AWESOME_VERSION = v4.5.0 FONT_AWESOME_SITE = $(call github,FortAwesome,Font-Awesome,$(FONT_AWESOME_VERSION)) -FONT_AWESOME_LICENSE = OFLv1.1 (font), MIT (CSS, LESS and Sass files) +FONT_AWESOME_LICENSE = OFL-1.1 (font), MIT (CSS, LESS and Sass files) FONT_AWESOME_DIRECTORIES_LIST = css fonts less scss define FONT_AWESOME_INSTALL_TARGET_CMDS
package/googlefontdirectory/googlefontdirectory.mk +1 -1
@@ -7,7 +7,7 @@ GOOGLEFONTDIRECTORY_SITE = \ https://s3.amazonaws.com/joemaller_google_webfonts GOOGLEFONTDIRECTORY_SOURCE = googlewebfonts.tgz -GOOGLEFONTDIRECTORY_LICENSE = OFLv1.1 +GOOGLEFONTDIRECTORY_LICENSE = OFL-1.1 GOOGLEFONTDIRECTORY_FONTS = \ $(call qstrip,$(BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS))
package/inconsolata/inconsolata.mk +1 -1
@@ -8,7 +8,7 @@ INCONSOLATA_VERSION = 001.010 INCONSOLATA_SITE = http://snapshot.debian.org/archive/debian/20090524T155154Z/pool/main/t/ttf-inconsolata INCONSOLATA_SOURCE = ttf-inconsolata_$(INCONSOLATA_VERSION).orig.tar.gz INCONSOLATA_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/inconsolata -INCONSOLATA_LICENSE = OFLv1.0 +INCONSOLATA_LICENSE = OFL-1.0 INCONSOLATA_LICENSE_FILES = OFL.txt define INCONSOLATA_INSTALL_TARGET_CMDS
package/liberation/liberation.mk +1 -1
@@ -8,7 +8,7 @@ LIBERATION_VERSION = 2.00.1 LIBERATION_SITE = https://releases.pagure.org/liberation-fonts LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation -LIBERATION_LICENSE = OFLv1.1 +LIBERATION_LICENSE = OFL-1.1 LIBERATION_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_LIBERATION_MONO),y)
Signature · 1 line
2.7.4
PATCH 2/9 package: use SPDX short identifier for libpng license
We want to use SPDX identifier for license string as much as possible. SPDX short identifier for libpng license is Libpng.
Signed-off-by Rahul Bedarkar <[email protected]>
--- package/libpng/libpng.mk | 2 +- package/python-pysmb/python-pysmb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/libpng/libpng.mk +1 -1
@@ -8,7 +8,7 @@ LIBPNG_VERSION = 1.6.28 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) -LIBPNG_LICENSE = libpng license +LIBPNG_LICENSE = Libpng LIBPNG_LICENSE_FILES = LICENSE LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib
package/python-pysmb/python-pysmb.mk +1 -1
@@ -7,7 +7,7 @@ PYTHON_PYSMB_VERSION = 1.1.19 PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz PYTHON_PYSMB_SITE = https://pypi.python.org/packages/f9/e7/1fd7faaa946cc6b43ce85bb7a177b75a4718d9c5e291201fec00112b497c -PYTHON_PYSMB_LICENSE = libpng license +PYTHON_PYSMB_LICENSE = Libpng PYTHON_PYSMB_LICENSE_FILES = LICENSE PYTHON_PYSMB_SETUP_TYPE = setuptools
Signature · 1 line
2.7.4
PATCH 3/9 libraw: use SPDX short identifier for CDDL license
In reply to Rahul BedarkarSigned-off-by Rahul Bedarkar <[email protected]>
--- package/libraw/libraw.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libraw/libraw.mk +1 -1
@@ -18,7 +18,7 @@ LIBRAW_CONF_OPTS += \ --disable-openmp \ --disable-demosaic-pack-gpl2 \ --disable-demosaic-pack-gpl3 -LIBRAW_LICENSE = LGPL-2.1 or CDDL 1.0 or LibRaw Software License 27032010 +LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 or LibRaw Software License 27032010 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README LIBRAW_DEPENDENCIES = host-pkgconf LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS)
Signature · 1 line
2.7.4
PATCH 4/9 package: use SPDX short identifier for ZPL license
In reply to Rahul BedarkarSigned-off-by Rahul Bedarkar <[email protected]>
--- package/python-meld3/python-meld3.mk | 2 +- package/python-zope-interface/python-zope-interface.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/python-meld3/python-meld3.mk +1 -1
@@ -7,7 +7,7 @@ PYTHON_MELD3_VERSION = 1.0.2 PYTHON_MELD3_SOURCE = meld3-$(PYTHON_MELD3_VERSION).tar.gz PYTHON_MELD3_SITE = https://pypi.python.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f -PYTHON_MELD3_LICENSE = ZPLv2.1 +PYTHON_MELD3_LICENSE = ZPL-2.1 PYTHON_MELD3_LICENSE_FILES = COPYRIGHT.txt LICENSE.txt PYTHON_MELD3_SETUP_TYPE = setuptools
package/python-zope-interface/python-zope-interface.mk +1 -1
@@ -8,7 +8,7 @@ PYTHON_ZOPE_INTERFACE_VERSION = 4.3.3 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz PYTHON_ZOPE_INTERFACE_SITE = https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916 PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools -PYTHON_ZOPE_INTERFACE_LICENSE = ZPLv2.1 +PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt $(eval $(python-package))
Signature · 1 line
2.7.4
PATCH 5/9 wpan-tools: correct license name
In reply to Rahul Bedarkariw license is ISC.
Signed-off-by Rahul Bedarkar <[email protected]>
--- package/wpan-tools/wpan-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/wpan-tools/wpan-tools.mk +1 -1
@@ -7,7 +7,7 @@ WPAN_TOOLS_VERSION = 0.5 WPAN_TOOLS_SITE = http://wpan.cakelab.org/releases WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl -WPAN_TOOLS_LICENSE = iw license +WPAN_TOOLS_LICENSE = ISC WPAN_TOOLS_LICENSE_FILES = COPYING $(eval $(autotools-package))
Signature · 1 line
2.7.4
PATCH 6/9 ntp: use SPDX short identifier for ntp license
In reply to Rahul BedarkarSigned-off-by Rahul Bedarkar <[email protected]>
--- package/ntp/ntp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/ntp/ntp.mk +1 -1
@@ -8,7 +8,7 @@ NTP_VERSION_MAJOR = 4.2 NTP_VERSION = $(NTP_VERSION_MAJOR).8p10 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent openssl $(if $(BR2_PACKAGE_BUSYBOX),busybox) -NTP_LICENSE = ntp license +NTP_LICENSE = NTP NTP_LICENSE_FILES = COPYRIGHT NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no NTP_CONF_OPTS = \
Signature · 1 line
2.7.4
PATCH 7/9 python-nfc: use SPDX short identifier for EUPL license
In reply to Rahul BedarkarSigned-off-by Rahul Bedarkar <[email protected]>
--- package/python-nfc/python-nfc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/python-nfc/python-nfc.mk +1 -1
@@ -9,6 +9,6 @@ PYTHON_NFC_SITE = https://launchpad.net/nfcpy PYTHON_NFC_SITE_METHOD = bzr PYTHON_NFC_DEPENDENCIES = libusb libusb-compat PYTHON_NFC_SETUP_TYPE = distutils -PYTHON_NFC_LICENSE = EUPLv1.1+ +PYTHON_NFC_LICENSE = EUPL-1.1+ $(eval $(python-package))
Signature · 1 line
2.7.4
PATCH 8/9 package: use SPDX short identifier for EPL license
In reply to Rahul BedarkarSigned-off-by Rahul Bedarkar <[email protected]>
--- package/mosquitto/mosquitto.mk | 2 +- package/python-paho-mqtt/python-paho-mqtt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/mosquitto/mosquitto.mk +1 -1
@@ -6,7 +6,7 @@ MOSQUITTO_VERSION = 1.4.10 MOSQUITTO_SITE = http://mosquitto.org/files/source -MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0 +MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 MOSQUITTO_INSTALL_STAGING = YES
package/python-paho-mqtt/python-paho-mqtt.mk +1 -1
@@ -7,7 +7,7 @@ PYTHON_PAHO_MQTT_VERSION = 1.2 PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz PYTHON_PAHO_MQTT_SITE = https://pypi.python.org/packages/82/d9/7064d3a0a1d62756a1a809c85b99f864c641b66de84c15458f72193b7708 -PYTHON_PAHO_MQTT_LICENSE = EPLv1.0 or EDLv1.0 +PYTHON_PAHO_MQTT_LICENSE = EPL-1.0 or EDLv1.0 PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10 PYTHON_PAHO_MQTT_SETUP_TYPE = distutils
Signature · 1 line
2.7.4
PATCH 9/9 php: add version to license string
In reply to Rahul BedarkarAs per LICENSE file, php uses PHP license version 3.01.
Signed-off-by Rahul Bedarkar <[email protected]>
--- package/php/php.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/php/php.mk +1 -1
@@ -11,7 +11,7 @@ PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install PHP_DEPENDENCIES = host-pkgconf -PHP_LICENSE = PHP +PHP_LICENSE = PHP-3.01 PHP_LICENSE_FILES = LICENSE PHP_CONF_OPTS = \ --mandir=/usr/share/man \
Signature · 1 line
2.7.4
PATCH 1/9 package: use SPDX short identifier for OFL license
In reply to Rahul BedarkarHello,
Quoted 6 lines · Rahul Bedarkar
We want to use SPDX identifier for license string as much as possible. SPDX short identifier for OFLv1.0/OFLv1.1 is OFL-1.0/OFL-1.1.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/OFLv([1]\.[0-1])/OFL-\1/g'
Quoted 8 lines
Signed-off-by Rahul Bedarkar <[email protected]>--- package/cantarell/cantarell.mk | 2 +- package/font-awesome/font-awesome.mk | 2 +- package/googlefontdirectory/googlefontdirectory.mk | 2 +- package/inconsolata/inconsolata.mk | 2 +- package/liberation/liberation.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
Thanks, all 9 patches applied!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com