mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-16 20:29:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

classes/license.bbclass: Improve generic license copy validation.

Browse Source 
Remove + char in any position for cover cases when license has
the form like GPL-2.0+-with-OpenSSL-exception.

[YOCTO #7584]

(From OE-Core rev: 9cff9d4e8c8ca7d6f41c4df16e484087213ae990)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón
2015-06-24 11:49:42 -05:00
committed by Richard Purdie
parent f76f0555b9
commit 6ae42d8851
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/license.bbclass
View File

@@ -76,8 +76,12 @@ license_create_manifest() {
continue
fi
# remove + chars in any position this cover cases like
# GPL-2.0+-with-OpenSSL-exception -> GPL-2.0-with-OpenSSL-exception
lic="$(echo ${lic} | sed "s/\+//g")"
# to reference a license file trim trailing + symbol
if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
fi
done