summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-07 17:50:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-08 14:58:32 +0100
commit5348ffce46d6706b7bb10e41a59e0f6cf16c62b0 (patch)
tree96d86c230dbd703cc01ee25284e34b4a321f7c6e
parent42ebda0c85f14f9f8a508f59115b141d645d4c77 (diff)
downloadopenembedded-core-contrib-5348ffce46d6706b7bb10e41a59e0f6cf16c62b0.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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass8
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):
# first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY
d.setVar('PACKAGES', "%s %s" % (pn_lic, packages))
d.setVar('FILES_' + pn_lic, files)
- for pn in packages.split():
- if pn == pn_lic:
- continue
- rrecommends_pn = d.getVar('RRECOMMENDS_' + pn)
- if rrecommends_pn:
- d.setVar('RRECOMMENDS_' + pn, "%s %s" % (pn_lic, rrecommends_pn))
- else:
- d.setVar('RRECOMMENDS_' + pn, "%s" % (pn_lic))
def copy_license_files(lic_files_paths, destdir):
import shutil