diff options
| author |   Reto Schneider <reto.schneider@husqvarnagroup.com> | 2021-04-26 23:27:57 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-05-03 04:56:23 -1000 |
| commit | 834a8e357bc999a0163e7c5bafbcc1a8816448d4 (patch) | |
| tree | b0704265571f4d5629c9bcd46a0230711f48f180 | |
| parent | 62ad9a56155453ea0a940679dd02bca9093fda65 (diff) | |
| download | openembedded-core-contrib-834a8e357bc999a0163e7c5bafbcc1a8816448d4.tar.gz | |
license_image.bbclass: Fix symlink to generic license files
Link to the canonical filename of a license as only this one exists.
Fixes commit 670fe71dd18ea675f35581db4a61fda137f8bf00
[license_image.bbclass: use canonical name for license files].
Signed-off-by: Reto Schneider <reto.schneider@husqvarnagroup.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 64b1ba978e079c345e1f7fbd1bf44052fc3dd857)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes/license_image.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index cfb0606da9..1396a95f47 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -145,12 +145,13 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): continue # Make sure we use only canonical name for the license file - rootfs_license = os.path.join(rootfs_license_dir, "generic_%s" % generic_lic) + generic_lic_file = "generic_%s" % generic_lic + rootfs_license = os.path.join(rootfs_license_dir, generic_lic_file) if not os.path.exists(rootfs_license): oe.path.copyhardlink(pkg_license, rootfs_license) if not os.path.exists(pkg_rootfs_license): - os.symlink(os.path.join('..', lic), pkg_rootfs_license) + os.symlink(os.path.join('..', generic_lic_file), pkg_rootfs_license) else: if (oe.license.license_ok(canonical_license(d, lic), bad_licenses) == False or |