diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-07 17:50:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-09 23:44:53 +0100 |
commit | 6491203eba661b6e977afbf243ddb8c6da5e27b9 (patch) | |
tree | a2e4b9734648e251c38a8bbc57fc6783e7408781 /meta | |
parent | 5e6b4111982a1c0ede238390a450881cde4b03e5 (diff) | |
download | poky-6491203eba661b6e977afbf243ddb8c6da5e27b9.tar.gz |
license: Drop adding RRECOMMENDS for license packages
This changes behaviour when LICENSE_CREATE_PACKAGE is in use. Packages
no longer have RRECOMMENDS adding to them.
It was highlighted that this doesn't apply to PACKAGES_DYNAMIC, nor can
it easily be made to do so. There is also a much easier way to handle this
which is:
IMAGE_INSTALL_COMPLEMENTARY += "*-lic"
which works on a per image basis and doesn't change the underlying
package dependencies. I propose we switch to this instead.
(From OE-Core rev: 5348ffce46d6706b7bb10e41a59e0f6cf16c62b0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/license.bbclass | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index f7978e266b..c87473cbb8 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -63,14 +63,6 @@ def add_package_and_files(d): | |||
63 | # first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY | 63 | # first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY |
64 | d.setVar('PACKAGES', "%s %s" % (pn_lic, packages)) | 64 | d.setVar('PACKAGES', "%s %s" % (pn_lic, packages)) |
65 | d.setVar('FILES_' + pn_lic, files) | 65 | d.setVar('FILES_' + pn_lic, files) |
66 | for pn in packages.split(): | ||
67 | if pn == pn_lic: | ||
68 | continue | ||
69 | rrecommends_pn = d.getVar('RRECOMMENDS_' + pn) | ||
70 | if rrecommends_pn: | ||
71 | d.setVar('RRECOMMENDS_' + pn, "%s %s" % (pn_lic, rrecommends_pn)) | ||
72 | else: | ||
73 | d.setVar('RRECOMMENDS_' + pn, "%s" % (pn_lic)) | ||
74 | 66 | ||
75 | def copy_license_files(lic_files_paths, destdir): | 67 | def copy_license_files(lic_files_paths, destdir): |
76 | import shutil | 68 | import shutil |