From: Reto Schneider Date: Mon, 26 Apr 2021 21:27:57 +0000 (+0200) Subject: license_image.bbclass: Fix symlink to generic license files X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~8048 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64b1ba978e079c345e1f7fbd1bf44052fc3dd857;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index b9a0f2359b4..73cebb4d55e 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -144,12 +144,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