From 6238ee3ecd385cbadd8e75eb8b22a96d9cb13639 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 28 Oct 2020 16:47:56 +0100 Subject: 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. Signed-off-by: Yann E. MORIN Cc: Peter Kjellerstedt Cc: Richard Purdie Cc: Alexandre BELLONI Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core') 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/" DEPENDS += "kern-tools-native virtual/crypt" -# bzip2 applet in busybox is based on lightly-modified bzip2 source +# bzip2 applet in busybox is based on lightly-modified bzip2-1.0.4 source # the GPL is version 2 only -LICENSE = "GPLv2 & bzip2-1.0.6" -LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb" +LICENSE = "GPLv2 & bzip2-1.0.4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \ + file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae" SECTION = "base" -- cgit 1.2.3-korg