diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-10-22 21:22:57 -0700 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-11-22 18:38:41 +0100 |
commit | 8ef1ab1273b331d0d39bcfc24a1fe80d77a588c7 (patch) | |
tree | f561541dc6de2da04d2b19a2b6810cdf91a9014e /recipes-core | |
parent | 7c71e14a9d8ed2c401a0ebb68894a631c7dbc90c (diff) | |
download | meta-java-8ef1ab1273b331d0d39bcfc24a1fe80d77a588c7.tar.gz |
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 <raj.khem@gmail.com>
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/bcel/bcel_5.2.bb | 4 | ||||
-rw-r--r-- | recipes-core/classpath/classpath-native.inc | 4 | ||||
-rw-r--r-- | recipes-core/classpathx/gnujaf_1.1.1.bb | 4 | ||||
-rw-r--r-- | recipes-core/classpathx/gnumail_1.1.2.bb | 3 | ||||
-rw-r--r-- | recipes-core/classpathx/inetlib_1.1.1.bb | 3 | ||||
-rw-r--r-- | recipes-core/jakarta-libs/bsf_2.4.0.bb | 3 | ||||
-rw-r--r-- | recipes-core/jamvm/jamvm.inc | 2 | ||||
-rw-r--r-- | recipes-core/xalan-j/xalan-j_2.7.1.bb | 4 | ||||
-rw-r--r-- | recipes-core/xerces-j/xerces-j_2.11.0.bb | 5 | ||||
-rw-r--r-- | 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 @@ | |||
1 | DESCRIPTION = "Java Bytecode manipulation library" | 1 | DESCRIPTION = "Java Bytecode manipulation library" |
2 | AUTHOR = "Apache Software Foundation" | 2 | AUTHOR = "Apache Software Foundation" |
3 | LICENSE = "AL2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44030f19e8bad73725f39d16fd05ff12" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44030f19e8bad73725f39d16fd05ff12" |
5 | 5 | PR = "r1" | |
6 | SRC_URI = "http://archive.apache.org/dist/jakarta/bcel/source/${BP}-src.tar.gz" | 6 | SRC_URI = "http://archive.apache.org/dist/jakarta/bcel/source/${BP}-src.tar.gz" |
7 | 7 | ||
8 | inherit java-library | 8 | 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 @@ | |||
1 | DESCRIPTION = "GNU Classpath standard Java libraries - For native Java-dependent programs" | 1 | DESCRIPTION = "GNU Classpath standard Java libraries - For native Java-dependent programs" |
2 | HOMEPAGE = "http://www.gnu.org/software/classpath/" | 2 | HOMEPAGE = "http://www.gnu.org/software/classpath/" |
3 | LICENSE = "Classpath" | 3 | LICENSE = "GPL-2.0 & SAX-PD" |
4 | 4 | ||
5 | DEPENDS = "fastjar-native zip-native" | 5 | DEPENDS = "fastjar-native zip-native" |
6 | 6 | ||
@@ -8,7 +8,7 @@ inherit autotools native gettext | |||
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" | 9 | SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" |
10 | 10 | ||
11 | INC_PR = "r5" | 11 | INC_PR = "r6" |
12 | 12 | ||
13 | export JAVA="${STAGING_BINDIR_NATIVE}/java-initial" | 13 | export JAVA="${STAGING_BINDIR_NATIVE}/java-initial" |
14 | export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" | 14 | 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 @@ | |||
1 | DESCRIPTION = "Provides a mean to type data and locate components suitable for performing various kinds of action on it." | 1 | DESCRIPTION = "Provides a mean to type data and locate components suitable for performing various kinds of action on it." |
2 | AUTHOR = "GNU ClasspathX" | 2 | AUTHOR = "GNU ClasspathX" |
3 | LICENSE = "GPL+libraryexception" | 3 | LICENSE = "GPL-2.0-with-GCC-exception" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" |
5 | 5 | ||
6 | PR = "r1" | ||
7 | |||
6 | SRC_URI = "http://ftp.gnu.org/gnu/classpathx/activation-${PV}.tar.gz \ | 8 | SRC_URI = "http://ftp.gnu.org/gnu/classpathx/activation-${PV}.tar.gz \ |
7 | file://datadir_java.patch \ | 9 | file://datadir_java.patch \ |
8 | " | 10 | " |
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 @@ | |||
1 | DESCRIPTION = "GNU's free implementation of the JavaMail API specification" | 1 | DESCRIPTION = "GNU's free implementation of the JavaMail API specification" |
2 | AUTHOR = "GNU ClasspathX" | 2 | AUTHOR = "GNU ClasspathX" |
3 | LICENSE = "GPL+libraryexception" | 3 | LICENSE = "GPL-2.0-with-GCC-exception" |
4 | PR = "r1" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=14bc6ee8b2e2b409be599212867d126e" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=14bc6ee8b2e2b409be599212867d126e" |
5 | 6 | ||
6 | SRC_URI = "http://ftp.gnu.org/gnu/classpathx/mail-${PV}.tar.gz \ | 7 | 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 @@ | |||
1 | DESCRIPTION = "A Java library of clients for common internet protocols" | 1 | DESCRIPTION = "A Java library of clients for common internet protocols" |
2 | AUTHOR = "GNU Classpath" | 2 | AUTHOR = "GNU Classpath" |
3 | HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html" | 3 | HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html" |
4 | LICENSE = "GPL+libraryexception" | 4 | LICENSE = "GPL-2.0-with-GCC-exception" |
5 | PR = "r1" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" |
6 | 7 | ||
7 | SRC_URI = "http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \ | 8 | 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 @@ | |||
1 | DESCRIPTION = "Bean Scripting Framework package" | 1 | DESCRIPTION = "Bean Scripting Framework package" |
2 | AUTHOR = "Apache Software Foundation" | 2 | AUTHOR = "Apache Software Foundation" |
3 | LICENSE = "AL2.0" | 3 | LICENSE = "Apache-2.0" |
4 | PR = "r1" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3" |
5 | 6 | ||
6 | SRC_URI = "http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.gz" | 7 | 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 @@ | |||
1 | DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." | 1 | DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." |
2 | HOMEPAGE = "http://jamvm.sourceforge.net/" | 2 | HOMEPAGE = "http://jamvm.sourceforge.net/" |
3 | LICENSE = "GPL" | 3 | LICENSE = "GPL-2.0" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" |
5 | 5 | ||
6 | DEPENDS = "zlib classpath virtual/javac-native libffi" | 6 | 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 @@ | |||
1 | DESCRIPTION = "Java XSLT processor" | 1 | DESCRIPTION = "Java XSLT processor" |
2 | LICENSE = "AL2.0" | 2 | LICENSE = "Apache-2.0" |
3 | LIC_FILES_CHKSUM = " \ | 3 | LIC_FILES_CHKSUM = " \ |
4 | file://${WORKDIR}/bsf-2.4.0/LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3 \ | 4 | file://${WORKDIR}/bsf-2.4.0/LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3 \ |
5 | file://${WORKDIR}/xalan-j_2_7_1/LICENSE.txt;md5=f4411652c74c374bb2564394185289ee \ | 5 | file://${WORKDIR}/xalan-j_2_7_1/LICENSE.txt;md5=f4411652c74c374bb2564394185289ee \ |
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = " \ | |||
7 | AUTHOR = "Apache Software Foundation" | 7 | AUTHOR = "Apache Software Foundation" |
8 | HOMEPAGE = "http://xml.apache.org/xalan-j" | 8 | HOMEPAGE = "http://xml.apache.org/xalan-j" |
9 | 9 | ||
10 | PR = "r1" | ||
11 | |||
10 | DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel" | 12 | DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel" |
11 | DEPENDS_virtclass-native = " \ | 13 | DEPENDS_virtclass-native = " \ |
12 | xerces-j-native regexp-native jlex-native cup-native jaxp1.3-native bcel-native \ | 14 | 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 @@ | |||
1 | DESCRIPTION = "Reference implementation of XNI, the Xerces Native Interface, and also a fully conforming XML Schema processor." | 1 | DESCRIPTION = "Reference implementation of XNI, the Xerces Native Interface, and also a fully conforming XML Schema processor." |
2 | AUTHOR = "Apache Software Foundation" | 2 | AUTHOR = "Apache Software Foundation" |
3 | LICENSE = "AL2.0" | 3 | LICENSE = "Apache-2.0" |
4 | |||
5 | PR = "r1" | ||
6 | |||
4 | LIC_FILES_CHKSUM = " \ | 7 | LIC_FILES_CHKSUM = " \ |
5 | file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \ | 8 | file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \ |
6 | file://LICENSE.DOM-documentation.html;md5=77c27084ca92e9a8efe9314f284acc05 \ | 9 | 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 @@ | |||
1 | DESCRIPTION = "Library to resolve various public or system identifiers into accessible URLs (Java)" | 1 | DESCRIPTION = "Library to resolve various public or system identifiers into accessible URLs (Java)" |
2 | AUTHOR = "Apache Software Foundation" | 2 | AUTHOR = "Apache Software Foundation" |
3 | LICENSE = "AL2.0" | 3 | LICENSE = "Apache-2.0" |
4 | PR = "r1" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.resolver.txt;md5=d229da563da18fe5d58cd95a6467d584" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.resolver.txt;md5=d229da563da18fe5d58cd95a6467d584" |
5 | 6 | ||
6 | SRC_URI = "http://archive.apache.org/dist/xml/commons/xml-commons-resolver-${PV}.tar.gz" | 7 | SRC_URI = "http://archive.apache.org/dist/xml/commons/xml-commons-resolver-${PV}.tar.gz" |