summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-04-08 20:16:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-10 12:27:02 (GMT)
commitf29617bf1831cf1c680f24185591dcf8391c2358 (patch)
tree038a752288f3a96ad246ecbf914b04d0f0dc99ba
parentc5d9b77ba8ed6dc6cc05c7f7d79d344260709d64 (diff)
downloadpoky-f29617bf1831cf1c680f24185591dcf8391c2358.tar.gz
license.bbclass: be a bit more strict when searching ${PN}-${LICENSE_PACKAGE_SUFFIX} in packages
* linux-firmware contains ${PN}-license package since this commit: commit 1ee083da0730408fffdbbf5f29abc299c0e61be9 Author: Jackie Huang <jackie.huang@windriver.com> Date: Mon Apr 13 10:17:21 2015 +0800 linux-firmware: fix the mess of licenses * LICENSE_CREATE_PACKAGE functionality in license.bbclass when enabled adds new package with suffix: LICENSE_PACKAGE_SUFFIX ??= "-lic" but then it checks if ${PN}-${LICENSE_PACKAGE_SUFFIX} is included in PACKAGES before adding it and when found it shows: WARNING: linux-firmware-1_0.0+gitAUTOINC+4c0bf113a5-r0 do_package: linux-firmware-lic package already existed in linux-firmware. and doesn't add the ${PN}-lic to PACKAGES and causes another warning: WARNING: linux-firmware-1_0.0+gitAUTOINC+4c0bf113a5-r0 do_package: QA Issue: linux-firmware: Files/directories were installed but not shipped in any package: /usr /usr/share /usr/share/licenses /usr/share/licenses/linux-firmware that's because it was searching ${PN}-lic in PACKAGES as a string so it found ${PN}-lic as a substring of ${PN}-license, add a split to search in an list (From OE-Core rev: 9b9897fc034819385a9d4ce591cc79dd458f3f24) (From OE-Core rev: 9aed83eb8694a0bd409a6a2481bfd2a1b98919e1) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Yocto 12572] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index a8df329..5103ed8 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -334,7 +334,7 @@ def add_package_and_files(d):
334 files = d.getVar('LICENSE_FILES_DIRECTORY') 334 files = d.getVar('LICENSE_FILES_DIRECTORY')
335 pn = d.getVar('PN') 335 pn = d.getVar('PN')
336 pn_lic = "%s%s" % (pn, d.getVar('LICENSE_PACKAGE_SUFFIX', False)) 336 pn_lic = "%s%s" % (pn, d.getVar('LICENSE_PACKAGE_SUFFIX', False))
337 if pn_lic in packages: 337 if pn_lic in packages.split():
338 bb.warn("%s package already existed in %s." % (pn_lic, pn)) 338 bb.warn("%s package already existed in %s." % (pn_lic, pn))
339 else: 339 else:
340 # first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY 340 # first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY