From 84a85837603eb891fb44d6fbd88cd56b83d8811c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 9 Aug 2022 16:58:25 -0500 Subject: fsl-eula-unpack.bbclass: Expose a function for reuse Expose find_nxp_eula_licenses for others to use. Signed-off-by: Tom Hochstein (cherry picked from commit 98275f8772806d6f67934b5dc0a1704eab2cebd0) --- classes/fsl-eula-unpack.bbclass | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index a0a7bc5e..d66acc5a 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -157,11 +157,21 @@ python fsl_bin_do_unpack() { bb.note("Checking LIC_FILES_CHKSUM for Freescale EULA consistency...") if found > 1: bb.warn("The package contains multiple Freescale EULA-licensed archives. The consistency logic may not be able to detect a EULA problem.") + (layer_license, licenses, md5sums, found_layer_licenses, found_package_licenses) = find_nxp_eula_licenses(d) + if not found_layer_licenses: + bb.fatal("The Freescale layer EULA '%s' is not listed in LIC_FILES_CHKSUM '%s'." + % (layer_license, licenses)) + if not found_package_licenses: + bb.fatal("A valid package EULA with md5sum in %s was not found in LIC_FILES_CHKSUM '%s'." + % (md5sums.split(), licenses)) +} + +def find_nxp_eula_licenses(d): layer_license = d.getVar('LIC_FILES_CHKSUM_LAYER') licenses = d.getVar('LIC_FILES_CHKSUM') or "" md5sums = d.getVar('FSL_EULA_FILE_MD5SUMS') or "" - found_layer_license = False - found_package_license = False + found_layer_licenses = "" + found_package_licenses = "" for license in licenses.split(): try: (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(license) @@ -171,14 +181,8 @@ python fsl_bin_do_unpack() { bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), license)) if license == layer_license: bb.note("Found Freescale EULA for the layer %s." % license) - found_layer_license = True + found_layer_licenses += license elif parm.get('md5') in md5sums: bb.note("Found Freescale EULA for the package %s." % license) - found_package_license = True - if not found_layer_license: - bb.fatal("The Freescale layer EULA '%s' is not listed in LIC_FILES_CHKSUM '%s'." - % (layer_license, licenses)) - if not found_package_license: - bb.fatal("A valid package EULA with md5sum in %s was not found in LIC_FILES_CHKSUM '%s'." - % (md5sums.split(), licenses)) -} + found_package_licenses += license + return (layer_license, licenses, md5sums, found_layer_licenses, found_package_licenses) -- cgit v1.2.3-54-g00ecf