genimage: set image environment inside image_generate()

The image environment is specific to the image being generated.
image_generate() calls itself recursively to resolve dependencies.
Because setenv_image() is called before image_generate(), the set image
environment is wrong as soon as image_generate() calls itself.

Fix that by setting the image environment inside image_generate() after
the point it might call itself for dependency resolution. This way the
image environment is always correct.

Signed-off-by: Bastian Krause <bst@pengutronix.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/genimage.c b/genimage.c
index 1125b90..7ce89e1 100644
--- a/genimage.c
+++ b/genimage.c
@@ -301,6 +301,10 @@ static int image_generate(struct image *image)
 		}
 	}
 
+	ret = setenv_image(image);
+	if (ret)
+		return ret;
+
 	if (image->exec_pre) {
 		ret = systemp(image, "%s", image->exec_pre);
 		if (ret)
@@ -853,10 +857,6 @@ int main(int argc, char *argv[])
 		goto cleanup;
 
 	list_for_each_entry(image, &images, list) {
-		ret = setenv_image(image);
-		if (ret)
-			goto cleanup;
-
 		ret = image_generate(image);
 		if (ret) {
 			image_error(image, "failed to generate %s\n", image->file);