]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
license_image: Make use of exit_if_errors consistent
authorPhilip Lorenz <philip.lorenz@bmw.de>
Mon, 28 Jul 2025 09:59:32 +0000 (11:59 +0200)
committerMathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Wed, 30 Jul 2025 09:52:36 +0000 (11:52 +0200)
`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 <philip.lorenz@bmw.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
meta/classes-recipe/license_image.bbclass

index d2c5ab902ce8d86c13efea7d9f6760be35faced2..0d8cd7ab9111a9f72ad1ea2a1e4e925003a6b6a1 100644 (file)
@@ -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