diff options
author | Elizabeth Flanagan <elizabeth.flanagan@intel.com> | 2012-10-02 16:01:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-03 10:04:08 +0100 |
commit | 094c4a08787157dcbba6eab3483238595f95c38a (patch) | |
tree | 1cbfb32419a53e31f4215ff5497ade95ad1d03ae | |
parent | 6d1aa1dc3131237a481fcada3bbe13c182136169 (diff) | |
download | poky-094c4a08787157dcbba6eab3483238595f95c38a.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.
(From OE-Core rev: a0b132798d2c1adf79414787b8317327a554f852)
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.inc | 3 | ||||
-rw-r--r-- | meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 2 |
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/" | |||
5 | 5 | ||
6 | # bzip2 applet in busybox is based on lightly-modified bzip2 source | 6 | # bzip2 applet in busybox is based on lightly-modified bzip2 source |
7 | # the GPL is version 2 only | 7 | # the GPL is version 2 only |
8 | # bzip2 is not a bzip2 license (no such thing) | 8 | LICENSE = "GPLv2 & bzip2" |
9 | LICENSE = "GPLv2 & BSD-4-Clause" | ||
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb" |
11 | 10 | ||
12 | SECTION = "base" | 11 | 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 | |||
4 | LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors." | 4 | LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors." |
5 | HOMEPAGE = "http://www.bzip.org/" | 5 | HOMEPAGE = "http://www.bzip.org/" |
6 | SECTION = "console/utils" | 6 | SECTION = "console/utils" |
7 | LICENSE = "BSD-4-Clause" | 7 | LICENSE = "bzip2" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2" |
9 | PR = "r5" | 9 | PR = "r5" |
10 | 10 | ||