aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElizabeth Flanagan <elizabeth.flanagan@intel.com>2012-10-02 16:01:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 10:04:03 +0100
commita0b132798d2c1adf79414787b8317327a554f852 (patch)
tree79f64197f7ab7e4310dabf9726d7decd5eb86c18
parent3e244e0e9c10438c2236e56b3de664d4560791f0 (diff)
downloadopenembedded-core-contrib-a0b132798d2c1adf79414787b8317327a554f852.tar.gz
bzip2 and busybox: Incorrect LICENSE
The license for bzip2 is not quite BSD. I have an email out to the maintainer to see if we can utilize a common BSD license (or something else) however, for now, we should revert bzip2 back to a special license. As busybox also utilizes a lightly modified bzip2, this also effects busybox. Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc3
-rw-r--r--meta/recipes-extended/bzip2/bzip2_1.0.6.bb2
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 33e01a4ce8..972e7d09c6 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -5,8 +5,7 @@ BUGTRACKER = "https://bugs.busybox.net/"
# bzip2 applet in busybox is based on lightly-modified bzip2 source
# the GPL is version 2 only
-# bzip2 is not a bzip2 license (no such thing)
-LICENSE = "GPLv2 & BSD-4-Clause"
+LICENSE = "GPLv2 & bzip2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb"
SECTION = "base"
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index 5f92deb689..d03b57d33a 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -4,7 +4,7 @@ Huffman coding. Compression is generally considerably better than that achieved
LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors."
HOMEPAGE = "http://www.bzip.org/"
SECTION = "console/utils"
-LICENSE = "BSD-4-Clause"
+LICENSE = "bzip2"
LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2"
PR = "r5"