From 34cc76ff05b0c2224f3d6f98bba847d4c5736827 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 4 Aug 2021 13:57:33 +0100 Subject: image/image_types: Convert CONVERSION_CMD/COMPRESS_CMD to new override syntax For consistency, use override syntax for these variables as well since it is more consistent with the rest of the image code. We may be able to use these as proper overrides in due course. (From OE-Core rev: 52674c4b1fdf79829095031b2e342d44fb0dc181) Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0321b4f7ae..df34c7884c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -457,11 +457,11 @@ python () { # Create input image first. gen_conversion_cmds(type) localdata.setVar('type', type) - cmd = "\t" + (localdata.getVar("CONVERSION_CMD_" + ctype) or localdata.getVar("COMPRESS_CMD_" + ctype)) + cmd = "\t" + (localdata.getVar("CONVERSION_CMD:" + ctype) or localdata.getVar("COMPRESS_CMD:" + ctype)) if cmd not in cmds: cmds.append(cmd) - vardeps.add('CONVERSION_CMD_' + ctype) - vardeps.add('COMPRESS_CMD_' + ctype) + vardeps.add('CONVERSION_CMD:' + ctype) + vardeps.add('COMPRESS_CMD:' + ctype) subimage = type + "." + ctype if subimage not in subimages: subimages.append(subimage) -- cgit v1.2.3-54-g00ecf