Patchwork [4/4] license.bbclass: include all licenses in the manifest

login
register
mail settings
Submitter Christopher Larson
Date June 10, 2013, 8:46 p.m.
Message ID <caed7f0fbb98ddfcb4af285909318efc22b90e3f.1370896985.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/51445/
State Accepted
Commit e87232828b761d56f1ce6a27e4009d350d68209c
Headers show

Comments

Christopher Larson - June 10, 2013, 8:46 p.m.
From: Christopher Larson <chris_larson@mentor.com>

When we don't have a generic license file for the license in question, we can
warn, but we should still include it in the manifest, otherwise the manifest
doesn't reflect reality. Failing to include a license listed in the recipe in
the manifest can't be allowed.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/classes/license.bbclass | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
Otavio Salvador - June 10, 2013, 9 p.m.
On Mon, Jun 10, 2013 at 5:46 PM, Christopher Larson <kergoth@gmail.com>wrote:

> From: Christopher Larson <chris_larson@mentor.com>
>
> When we don't have a generic license file for the license in question, we
> can
> warn, but we should still include it in the manifest, otherwise the
> manifest
> doesn't reflect reality. Failing to include a license listed in the recipe
> in
> the manifest can't be allowed.
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>

Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>

Patch

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 76749c4..2ca47cc 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -51,11 +51,10 @@  license_create_manifest() {
 		printf "LICENSE:" >> ${LICENSE_MANIFEST}
 		for lic in ${pkged_lic}; do
 			# to reference a license file trim trailing + symbol
-			if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
-				printf " ${lic}" >> ${LICENSE_MANIFEST}
-			else
-				echo "WARNING: The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
+			if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
+				bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
 			fi
+                        printf " ${lic}" >> ${LICENSE_MANIFEST}
 		done
 		printf "\n\n" >> ${LICENSE_MANIFEST}
 	done