summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2020-10-28 16:47:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-12 13:06:28 +0000
commitd59e28ea734878b0873ab627d548d35469a41a0f (patch)
tree2fa7b06e9635505cb30372ff458d2b52e777925f
parent61642ef429b7f17303fcf10d0638bf50fe4a8cb9 (diff)
downloadpoky-d59e28ea734878b0873ab627d548d35469a41a0f.tar.gz
recipes-core/busybox: fixup licensing information
Commit 7d32417b4d (busybox: Correct the name of the bzip2 license) changes the licesne from 'bzip2' to 'bzip2-1.0.6' on the rationale that the 'bzip2 license was renamed from "bzip2" to "bzip2-1.0.6" [...] to match the official SPDX identifier.' Though the above is true for the bzip2 and pbzip2 packages, the bzip2 code bundled in busybox is a copy from the bzip2 1.0.4 version, not the 1.0.6 version. As such, using bzip2-1.0.6 is wrong. Unfortunately, there is no official SPDX license identifier for this bzip2 1.0.4 version, so we just mimick the existing ones (bzip2-1.0.5 and bzip2-1.0.6) by using bzip2-1.0.4. Also, there is a license file attached to that, so we add it to the list. (From OE-Core rev: 6238ee3ecd385cbadd8e75eb8b22a96d9cb13639) (From OE-Core rev: fb590d12a0979e0db69e9d7b0cb605467f678000) Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Alexandre BELLONI <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0776bf6600c42cec2961d3f6d33c8c9c09cbb1ce) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 45aaa2b41c..e0522be729 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -5,10 +5,11 @@ BUGTRACKER = "https://bugs.busybox.net/"
5 5
6DEPENDS += "kern-tools-native virtual/crypt" 6DEPENDS += "kern-tools-native virtual/crypt"
7 7
8# bzip2 applet in busybox is based on lightly-modified bzip2 source 8# bzip2 applet in busybox is based on lightly-modified bzip2-1.0.4 source
9# the GPL is version 2 only 9# the GPL is version 2 only
10LICENSE = "GPLv2 & bzip2-1.0.6" 10LICENSE = "GPLv2 & bzip2-1.0.4"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \
12 file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae"
12 13
13SECTION = "base" 14SECTION = "base"
14 15