mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

license_image.bbclass: Fix symlink to generic license files

Browse Source 
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].

(From OE-Core rev: 64b1ba978e079c345e1f7fbd1bf44052fc3dd857)

Signed-off-by: Reto Schneider <reto.schneider@husqvarnagroup.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Reto Schneider
2021-04-26 23:27:57 +02:00
committed by Richard Purdie
parent 62eb846232
commit 73bdeae2fc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/license_image.bbclass
+3 -2
View File
@@ -144,12 +144,13 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True):
continue continue
# Make sure we use only canonical name for the license file # 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): if not os.path.exists(rootfs_license):
oe.path.copyhardlink(pkg_license, rootfs_license) oe.path.copyhardlink(pkg_license, rootfs_license)
if not os.path.exists(pkg_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: else:
if (oe.license.license_ok(canonical_license(d, if (oe.license.license_ok(canonical_license(d,
lic), bad_licenses) == False or lic), bad_licenses) == False or