From: Philip Lorenz Date: Mon, 28 Jul 2025 09:59:32 +0000 (+0200) Subject: license_image: Make use of exit_if_errors consistent X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afd1cd175c8578d3edfcf8a2f1ff7290afc75b21;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git license_image: Make use of exit_if_errors consistent `exit_if_errors` is typically called at the end of the outermost call site (e.g. the task or hook calling a function which raises QA issues). Adapt license_image accordingly. Signed-off-by: Philip Lorenz Signed-off-by: Mathieu Dubois-Briand --- diff --git a/meta/classes-recipe/license_image.bbclass b/meta/classes-recipe/license_image.bbclass index d2c5ab902c..0d8cd7ab91 100644 --- a/meta/classes-recipe/license_image.bbclass +++ b/meta/classes-recipe/license_image.bbclass @@ -51,6 +51,8 @@ python license_create_manifest() { rootfs_license_manifest = os.path.join(d.getVar('LICENSE_DIRECTORY'), d.getVar('SSTATE_PKGARCH'), d.getVar('IMAGE_NAME'), 'license.manifest') write_license_files(d, rootfs_license_manifest, pkg_dic, rootfs=True) + + oe.qa.exit_if_errors(d) } def write_license_files(d, license_manifest, pkg_dic, rootfs=True): @@ -116,7 +118,6 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): "The license listed %s was not in the "\ "licenses collected for recipe %s" % (lic, pkg_dic[pkg]["PN"]), d) - oe.qa.exit_if_errors(d) # Two options here: # - Just copy the manifest