From 8ef1ab1273b331d0d39bcfc24a1fe80d77a588c7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 22 Oct 2012 21:22:57 -0700 Subject: recipes: Fix license strings to match common licenses Fixes warnings like WARNING: bcel-native: No generic license file exists for: AL2.0 in any provider and so on Signed-off-by: Khem Raj --- recipes-core/bcel/bcel_5.2.bb | 4 ++-- recipes-core/classpath/classpath-native.inc | 4 ++-- recipes-core/classpathx/gnujaf_1.1.1.bb | 4 +++- recipes-core/classpathx/gnumail_1.1.2.bb | 3 ++- recipes-core/classpathx/inetlib_1.1.1.bb | 3 ++- recipes-core/jakarta-libs/bsf_2.4.0.bb | 3 ++- recipes-core/jamvm/jamvm.inc | 2 +- recipes-core/xalan-j/xalan-j_2.7.1.bb | 4 +++- recipes-core/xerces-j/xerces-j_2.11.0.bb | 5 ++++- recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb | 3 ++- 10 files changed, 23 insertions(+), 12 deletions(-) diff --git a/recipes-core/bcel/bcel_5.2.bb b/recipes-core/bcel/bcel_5.2.bb index a6990e4..27fd8d9 100644 --- a/recipes-core/bcel/bcel_5.2.bb +++ b/recipes-core/bcel/bcel_5.2.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Java Bytecode manipulation library" AUTHOR = "Apache Software Foundation" -LICENSE = "AL2.0" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44030f19e8bad73725f39d16fd05ff12" - +PR = "r1" SRC_URI = "http://archive.apache.org/dist/jakarta/bcel/source/${BP}-src.tar.gz" inherit java-library diff --git a/recipes-core/classpath/classpath-native.inc b/recipes-core/classpath/classpath-native.inc index 541c243..dcc30d2 100644 --- a/recipes-core/classpath/classpath-native.inc +++ b/recipes-core/classpath/classpath-native.inc @@ -1,6 +1,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries - For native Java-dependent programs" HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" +LICENSE = "GPL-2.0 & SAX-PD" DEPENDS = "fastjar-native zip-native" @@ -8,7 +8,7 @@ inherit autotools native gettext SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" -INC_PR = "r5" +INC_PR = "r6" export JAVA="${STAGING_BINDIR_NATIVE}/java-initial" export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" diff --git a/recipes-core/classpathx/gnujaf_1.1.1.bb b/recipes-core/classpathx/gnujaf_1.1.1.bb index 962496d..d6b9e0f 100644 --- a/recipes-core/classpathx/gnujaf_1.1.1.bb +++ b/recipes-core/classpathx/gnujaf_1.1.1.bb @@ -1,8 +1,10 @@ DESCRIPTION = "Provides a mean to type data and locate components suitable for performing various kinds of action on it." AUTHOR = "GNU ClasspathX" -LICENSE = "GPL+libraryexception" +LICENSE = "GPL-2.0-with-GCC-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" +PR = "r1" + SRC_URI = "http://ftp.gnu.org/gnu/classpathx/activation-${PV}.tar.gz \ file://datadir_java.patch \ " diff --git a/recipes-core/classpathx/gnumail_1.1.2.bb b/recipes-core/classpathx/gnumail_1.1.2.bb index 4cdee2b..3a67e5e 100644 --- a/recipes-core/classpathx/gnumail_1.1.2.bb +++ b/recipes-core/classpathx/gnumail_1.1.2.bb @@ -1,6 +1,7 @@ DESCRIPTION = "GNU's free implementation of the JavaMail API specification" AUTHOR = "GNU ClasspathX" -LICENSE = "GPL+libraryexception" +LICENSE = "GPL-2.0-with-GCC-exception" +PR = "r1" LIC_FILES_CHKSUM = "file://COPYING;md5=14bc6ee8b2e2b409be599212867d126e" SRC_URI = "http://ftp.gnu.org/gnu/classpathx/mail-${PV}.tar.gz \ diff --git a/recipes-core/classpathx/inetlib_1.1.1.bb b/recipes-core/classpathx/inetlib_1.1.1.bb index 9e507c0..f078e33 100644 --- a/recipes-core/classpathx/inetlib_1.1.1.bb +++ b/recipes-core/classpathx/inetlib_1.1.1.bb @@ -1,7 +1,8 @@ DESCRIPTION = "A Java library of clients for common internet protocols" AUTHOR = "GNU Classpath" HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html" -LICENSE = "GPL+libraryexception" +LICENSE = "GPL-2.0-with-GCC-exception" +PR = "r1" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \ diff --git a/recipes-core/jakarta-libs/bsf_2.4.0.bb b/recipes-core/jakarta-libs/bsf_2.4.0.bb index 7d7b85c..02a6c7d 100644 --- a/recipes-core/jakarta-libs/bsf_2.4.0.bb +++ b/recipes-core/jakarta-libs/bsf_2.4.0.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Bean Scripting Framework package" AUTHOR = "Apache Software Foundation" -LICENSE = "AL2.0" +LICENSE = "Apache-2.0" +PR = "r1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3" SRC_URI = "http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.gz" diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index bdc4928..bf2bc4b 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -1,6 +1,6 @@ DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." HOMEPAGE = "http://jamvm.sourceforge.net/" -LICENSE = "GPL" +LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "zlib classpath virtual/javac-native libffi" diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb b/recipes-core/xalan-j/xalan-j_2.7.1.bb index 85fc0b5..67c4d66 100644 --- a/recipes-core/xalan-j/xalan-j_2.7.1.bb +++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Java XSLT processor" -LICENSE = "AL2.0" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = " \ file://${WORKDIR}/bsf-2.4.0/LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3 \ file://${WORKDIR}/xalan-j_2_7_1/LICENSE.txt;md5=f4411652c74c374bb2564394185289ee \ @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = " \ AUTHOR = "Apache Software Foundation" HOMEPAGE = "http://xml.apache.org/xalan-j" +PR = "r1" + DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel" DEPENDS_virtclass-native = " \ xerces-j-native regexp-native jlex-native cup-native jaxp1.3-native bcel-native \ diff --git a/recipes-core/xerces-j/xerces-j_2.11.0.bb b/recipes-core/xerces-j/xerces-j_2.11.0.bb index ac63645..be6d765 100644 --- a/recipes-core/xerces-j/xerces-j_2.11.0.bb +++ b/recipes-core/xerces-j/xerces-j_2.11.0.bb @@ -1,6 +1,9 @@ DESCRIPTION = "Reference implementation of XNI, the Xerces Native Interface, and also a fully conforming XML Schema processor." AUTHOR = "Apache Software Foundation" -LICENSE = "AL2.0" +LICENSE = "Apache-2.0" + +PR = "r1" + LIC_FILES_CHKSUM = " \ file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \ file://LICENSE.DOM-documentation.html;md5=77c27084ca92e9a8efe9314f284acc05 \ diff --git a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb index b8a80db..93a5c31 100644 --- a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb +++ b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Library to resolve various public or system identifiers into accessible URLs (Java)" AUTHOR = "Apache Software Foundation" -LICENSE = "AL2.0" +LICENSE = "Apache-2.0" +PR = "r1" LIC_FILES_CHKSUM = "file://LICENSE.resolver.txt;md5=d229da563da18fe5d58cd95a6467d584" SRC_URI = "http://archive.apache.org/dist/xml/commons/xml-commons-resolver-${PV}.tar.gz" -- cgit v1.2.3-54-g00ecf